]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed2334b 3ad76eb)
Merge branch 'staging' of https://github.com/opdenkamp/tvheadend into opdenkamp-staging
authorAndreas Öman <andreas@lonelycoder.com>
Mon, 21 Mar 2011 21:37:44 +0000 (22:37 +0100)
committerAndreas Öman <andreas@lonelycoder.com>
Mon, 21 Mar 2011 21:37:44 +0000 (22:37 +0100)

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