Merge branch 'develop' into release-1.5.8
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 9 Jul 2014 10:27:35 +0000 (12:27 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 9 Jul 2014 10:27:35 +0000 (12:27 +0200)
1  2 
AndroidManifest.xml

Simple merge