From: ghost <andreas.monzner@multimedia-labs.de>
Date: Sun, 6 Sep 2009 07:16:16 +0000 (+0200)
Subject: Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
X-Git-Tag: 2.6.0~74
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/6d424e7cd304f215e1e40a135033321509db09ec

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

6d424e7cd304f215e1e40a135033321509db09ec