]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d328f74 cbc4600)
Merge remote-tracking branch 'origin/pr/344'
authorAdam Sutton <dev@adamsutton.me.uk>
Tue, 18 Mar 2014 21:40:52 +0000 (21:40 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Tue, 18 Mar 2014 21:40:52 +0000 (21:40 +0000)

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