Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Tue, 7 Jun 2011 10:24:25 +0000 (12:24 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Tue, 7 Jun 2011 10:24:25 +0000 (12:24 +0200)
commitbc8fee9bc588e869077ecfe8504116b129ecd412
treef33f392b1f712cde7086464e962bac68c0f67604
parent915b00cfce4de75afb704fc366cd930ddc7f6b2c
parent264ca6deb5ce32d4720ecf69ec2c67eafa8e7761
Merge branch 'master' of git://openpandora.org/openpandora.oe