]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 72be167 a76f365)
Merge remote branch 'upstream/master' into upstream
authorJohn Törnblom <john.tornblom@gmail.com>
Wed, 14 Mar 2012 06:45:33 +0000 (07:45 +0100)
committerJohn Törnblom <john.tornblom@gmail.com>
Wed, 14 Mar 2012 06:45:33 +0000 (07:45 +0100)

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