From: Adam Sutton <dev@adamsutton.me.uk>
Date: Fri, 22 Jun 2012 09:34:57 +0000 (+0100)
Subject: Merge branch 'epg-autoscan' into epg-eitscan
X-Git-Tag: 3.3~219^2~46^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a454c80dbfdcb02e3b8cd7425d7cf4cdb9259cfc;p=thirdparty%2Ftvheadend.git

Merge branch 'epg-autoscan' into epg-eitscan
---

a454c80dbfdcb02e3b8cd7425d7cf4cdb9259cfc