]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: bc20532 4abb686)
Merge remote-tracking branch 'adamsutton/master'
authorAndreas Öman <andreas@lonelycoder.com>
Tue, 19 Jun 2012 18:27:15 +0000 (20:27 +0200)
committerAndreas Öman <andreas@lonelycoder.com>
Tue, 19 Jun 2012 18:27:15 +0000 (20:27 +0200)

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