]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 55e89d5 3788e9a)
Merge remote-tracking branch 'origin/pr/372'
authorAdam Sutton <dev@adamsutton.me.uk>
Sat, 7 Jun 2014 21:38:55 +0000 (22:38 +0100)
committerAdam Sutton <dev@adamsutton.me.uk>
Sat, 7 Jun 2014 21:38:55 +0000 (22:38 +0100)

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