From: Felix Domke <tmbinc@elitedvb.net>
Date: Fri, 13 Feb 2009 14:11:21 +0000 (+0100)
Subject: Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
X-Git-Url: http://code.vuplus.com/gitweb/?p=vuplus_dvbapp;a=commitdiff_plain;h=935c5f9abeb0d6189c57f8406855d8437db8b0db

Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
---

935c5f9abeb0d6189c57f8406855d8437db8b0db
diff --cc mytest.py
index ee22e20,423031f..c335bf2
mode 100644,100755..100755
--- a/mytest.py
+++ b/mytest.py