]> git.ipfire.org Git - thirdparty/tvheadend.git/commit
Merge branch 'http_service_stream' of https://github.com/john-tornblom/tvheadend...
authorAndreas Öman <andreas@lonelycoder.com>
Fri, 7 Jan 2011 13:41:59 +0000 (14:41 +0100)
committerAndreas Öman <andreas@lonelycoder.com>
Fri, 7 Jan 2011 13:41:59 +0000 (14:41 +0100)
commit903a61f78536777a30344816268e4047abc8977e
treea1b2ad65261cdd55fde5d6e25501902f8be72a82
parent48ee984082ed8726bc40466c64a5cc366e31e3cd
parent3b69376f4007acf85384b77e5c526f859823ebce
Merge branch 'http_service_stream' of https://github.com/john-tornblom/tvheadend into john-tornblom-http_service_stream