From: ghost <andreas.monzner@multimedia-labs.de>
Date: Thu, 11 Dec 2008 15:38:00 +0000 (+0100)
Subject: Merge branch 'master' of git.opendreambox.org:/git/enigma2
X-Git-Tag: 2.6.0~543^2~16
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/1042aa5de2ce7e8431b740425169e656bf748eea

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

1042aa5de2ce7e8431b740425169e656bf748eea