From: Stefan Pluecken <stefan.pluecken@multimedia-labs.de>
Date: Sun, 15 Nov 2009 10:52:44 +0000 (+0100)
Subject: Merge branch '2.6' of git.opendreambox.org:/git/enigma2 into 2.6
X-Git-Tag: 2.6.1~13^2~1
X-Git-Url: https://git.cweiske.de/enigma2.git/commitdiff_plain/2d41896b26c577a592a70b3e36acc368977ee0c5?hp=5607b07c7bc261605a984d103ae5d7132bdd5cf0

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