]> git.ipfire.org Git - thirdparty/tvheadend.git/commitdiff
projects / thirdparty / tvheadend.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a5a353f 81e53b3)
Merge branch 'master' of github.com:mikrohard/tvheadend 41/head
authorJernej Fijačko <jernej@jernej-ThinkCentre-M91p.(none)>
Wed, 12 Oct 2011 11:40:31 +0000 (13:40 +0200)
committerJernej Fijačko <jernej@jernej-ThinkCentre-M91p.(none)>
Wed, 12 Oct 2011 11:40:31 +0000 (13:40 +0200)

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