Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet'
authorghost <andreas.monzner@multimedia-labs.de>
Tue, 13 Sep 2011 08:50:43 +0000 (10:50 +0200)
committerghost <andreas.monzner@multimedia-labs.de>
Tue, 13 Sep 2011 08:50:43 +0000 (10:50 +0200)
commit804ad88e6679853bd2db717fc542263d48075631
tree87e2fb5558b79ef89154176f5efdda3921ee8f03
parent64d399c3d183fa3f7d02fb73e474e42583538def
parent005321304bec7f71e748db3173d411f5684642e2
Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet'
data/setup.xml
lib/python/Components/UsageConfig.py
lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBarGenerics.py