]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dc128ff 94704a7)
Merge remote-tracking branch 'origin/pr/231'
authorAdam Sutton <dev@adamsutton.me.uk>
Sat, 26 Jan 2013 00:28:44 +0000 (00:28 +0000)
committerAdam Sutton <dev@adamsutton.me.uk>
Sat, 26 Jan 2013 00:28:44 +0000 (00:28 +0000)

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