]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8cf1932 25becc7)
Merge branch 'master' into epg-rewrite
authorAdam Sutton <dev@adamsutton.me.uk>
Wed, 20 Jun 2012 11:47:13 +0000 (12:47 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Wed, 20 Jun 2012 11:47:13 +0000 (12:47 +0100)

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