From: acid-burn <acid-burn@opendreambox.org>
Date: Tue, 5 Oct 2010 11:00:54 +0000 (+0200)
Subject: Merge commit 'origin/bug_578_translateable_meta_descriptions'
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=be8ccc9f63c4cd79f8dba84087c7348c23657865

Merge commit 'origin/bug_578_translateable_meta_descriptions'

Conflicts:
	lib/python/Plugins/Extensions/GraphMultiEPG/meta/plugin_graphmultiepg.xml
---

be8ccc9f63c4cd79f8dba84087c7348c23657865