Merge branch 'develop' into review_build_process
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 31 Oct 2013 16:30:38 +0000 (17:30 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 31 Oct 2013 16:30:38 +0000 (17:30 +0100)
1  2 
AndroidManifest.xml

Simple merge