Merge remote-tracking branch 'origin/master'
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Jul 2012 08:42:07 +0000 (10:42 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 2 Jul 2012 08:42:07 +0000 (10:42 +0200)
1  2 
AndroidManifest.xml

Simple merge