Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Fri, 23 Apr 2010 00:43:33 +0000 (02:43 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Fri, 23 Apr 2010 00:43:33 +0000 (02:43 +0200)
commit50db14d5da1c1b68c1d646795fff962f68a57c3a
tree4ee5e8c8f411c68e5317b7505c7404c871193c3f
parent12655ec572c74ba6625e41f979b5f5e8dd00e4d6
parent607a487e8cf2f4fd1e7389b9a04011a93cf7763a
Merge branch 'master' of git://openpandora.org/openpandora.oe