Merge branch 'master' of git://openpandora.org/pandora-misc
authorMichael Mrozek <EvilDragon@openpandora.de>
Fri, 4 Mar 2011 23:07:10 +0000 (00:07 +0100)
committerMichael Mrozek <EvilDragon@openpandora.de>
Fri, 4 Mar 2011 23:07:10 +0000 (00:07 +0100)
commit20f04cc4605d4f74f11e0b7a589a782b28dac0b6
treee1716aea0286c6607fa959dcd027540e6d3969f1
parent8dd7f8c6401c215f53c40e5cc6dd6dc0c647daec
parent51cdefeeb6c7d48c858689f0f7868b31039725b3
Merge branch 'master' of git://openpandora.org/pandora-misc