Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
authorFelix Domke <tmbinc@elitedvb.net>
Fri, 13 Feb 2009 14:11:21 +0000 (15:11 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Fri, 13 Feb 2009 14:11:21 +0000 (15:11 +0100)
1  2 
mytest.py

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