Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Wed, 21 Apr 2010 03:13:19 +0000 (05:13 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Wed, 21 Apr 2010 03:13:19 +0000 (05:13 +0200)

Trivial merge