From: ghost <andreas.monzner@multimedia-labs.de>
Date: Tue, 13 Sep 2011 08:50:43 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=804ad88e6679853bd2db717fc542263d48075631

Merge remote-tracking branch 'origin/bug_453_multiepg_no_more_ask_bouquet'
---

804ad88e6679853bd2db717fc542263d48075631
diff --cc data/setup.xml
index 5f7cbf6,93549fa..8620709
mode 100755,100644..100755
--- a/data/setup.xml
+++ b/data/setup.xml