Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet' into exper...
authorghost <andreas.monzner@multimedia-labs.de>
Thu, 10 Mar 2011 18:34:07 +0000 (19:34 +0100)
committerghost <andreas.monzner@multimedia-labs.de>
Thu, 10 Mar 2011 18:34:07 +0000 (19:34 +0100)
1  2 
lib/python/Plugins/Extensions/GraphMultiEPG/plugin.py
lib/python/Screens/ChannelSelection.py
lib/python/Screens/InfoBarGenerics.py

Simple merge