From: Andreas Öman Date: Mon, 21 Mar 2011 21:29:47 +0000 (+0100) Subject: Merge branch 'status_xml_epg' of https://github.com/jdembski/tvheadend into jdembski... X-Git-Tag: 2.99~78 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1dd7dd9018a3682e8d190ed9d28e827922f8f9b8;p=thirdparty%2Ftvheadend.git Merge branch 'status_xml_epg' of https://github.com/jdembski/tvheadend into jdembski-status_xml_epg --- 1dd7dd9018a3682e8d190ed9d28e827922f8f9b8