]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c84bc2b 99c34ba)
Merge remote-tracking branch 'origin/pr/333'
authorAdam Sutton <dev@adamsutton.me.uk>
Mon, 10 Mar 2014 20:10:55 +0000 (20:10 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Mon, 10 Mar 2014 20:10:55 +0000 (20:10 +0000)

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