Merge branch 'master' of git://openpandora.org/openpandora.oe
authorMichael Mrozek <EvilDragon@openpandora.org>
Thu, 8 Apr 2010 20:01:15 +0000 (22:01 +0200)
committerMichael Mrozek <EvilDragon@openpandora.org>
Thu, 8 Apr 2010 20:01:15 +0000 (22:01 +0200)
commitd380c73dbd808b3f82fe3d205ab4f58f8397f938
tree809a64c2eb841ec20d0a918dd665b21c38719d32
parent8bfb5aad78b87135bd43cef34b8be1da87aaece5
parent871fc6387b111971a6326a4f67df9d2a8ad040bc
Merge branch 'master' of git://openpandora.org/openpandora.oe