]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3be2887 080adf9)
Merge remote-tracking branch 'upstream/master'
authorJohn Törnblom <john.tornblom@gmail.com>
Thu, 9 Aug 2012 17:17:08 +0000 (19:17 +0200)
committerJohn Törnblom <john.tornblom@gmail.com>
Thu, 9 Aug 2012 17:17:08 +0000 (19:17 +0200)

Trivial merge
Mirror of https://github.com/tvheadend/tvheadend.git