Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.de>
Fri, 23 Jul 2010 22:46:23 +0000 (00:46 +0200)
committerMichael Mrozek <EvilDragon@openpandora.de>
Fri, 23 Jul 2010 22:46:23 +0000 (00:46 +0200)
commitde6f509f66c2b9bd615c6e8ab3ff955c7fa86228
treed6966d16d2b5f818846618d8ed97ce3bf4528090
parentfdc12660dd19afe39b3ea8091cbfe45f64b560ba
parenta8b365a43705f1e8567e297f7aeaaeba966bf21f
Merge branch 'master' of git://openpandora.org/openpandora.oe