Merge pull request #1864 from nemphys/epg-scan
authorLars Op den Kamp <opdenkamp@gmail.com>
Sat, 1 Dec 2012 01:46:02 +0000 (17:46 -0800)
committerLars Op den Kamp <opdenkamp@gmail.com>
Sat, 1 Dec 2012 01:46:02 +0000 (17:46 -0800)
epg: new advanced setting that overrides the user defined EPG update int...


Trivial merge