From: Andreas Öman Date: Fri, 7 Jan 2011 13:41:59 +0000 (+0100) Subject: Merge branch 'http_service_stream' of https://github.com/john-tornblom/tvheadend... X-Git-Tag: 2.99~116 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=903a61f78536777a30344816268e4047abc8977e;p=thirdparty%2Ftvheadend.git Merge branch 'http_service_stream' of https://github.com/john-tornblom/tvheadend into john-tornblom-http_service_stream --- 903a61f78536777a30344816268e4047abc8977e