From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 7 May 2009 06:17:59 +0000 (+0200)
Subject: Merge branch 'master' of git://git.opendreambox.org/git/acidburn/enigma2-master
X-Git-Tag: 2.6.0~320^2~5
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/01261afa97d904fa9b2564aedabe1363d87ff186

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

01261afa97d904fa9b2564aedabe1363d87ff186