]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 288edf7 4b7ffc0)
Merge remote-tracking branch 'origin/pr/257'
authorAdam Sutton <dev@adamsutton.me.uk>
Fri, 8 Mar 2013 10:44:52 +0000 (10:44 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Fri, 8 Mar 2013 10:44:52 +0000 (10:44 +0000)

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