Fixed a merge conflict 0.1.9.x
authorMichele macno Azzolari <macno@macno.org>
Sun, 31 Oct 2010 08:04:27 +0000 (09:04 +0100)
committerMichele macno Azzolari <macno@macno.org>
Sun, 31 Oct 2010 08:04:27 +0000 (09:04 +0100)
commitee8220f72d1f35b3d2f1265a0324b234a6f49d08
treee64a3ac9fa28852862119077c9ba6d9b1795360c
parent9cce0db56f7dea8791f36f9cd5b4f6eb0bee3090
Fixed a merge conflict
AndroidManifest.xml