]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1e7cfe9 2e09a06)
Merge branch 'master' of github.com:tvheadend/tvheadend
authorAdam Sutton <dev@adamsutton.me.uk>
Thu, 2 Aug 2012 09:14:58 +0000 (10:14 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Thu, 2 Aug 2012 09:14:58 +0000 (10:14 +0100)

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