Fixed conflict merge
authorMichele macno Azzolari <macno@macno.org>
Sun, 31 Oct 2010 08:20:37 +0000 (09:20 +0100)
committerMichele macno Azzolari <macno@macno.org>
Sun, 31 Oct 2010 08:20:37 +0000 (09:20 +0100)
commitc56a1829baf6c0e5443fb6fed93127536015bb30
treeb062b017a76db79fbdc0966a21a74bad9a97c58d
parentab4521df76a6ecc7251a8e163a9cb8a1f3602a69
Fixed conflict merge
AndroidManifest.xml