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)
commit49c69609eaba304a740b1a8dbd37e619d0fb82cf
tree3dfb75fe3d65c2506885e7acb8e35ca4838c2f5b
parentdf5fe2d6484b875b92336967ac2c947786d749e6
parent8699c0414eb6f60a6ff6f6b07b6bfe3395cc46f3
Merge branch 'develop' into release-1.5.8
AndroidManifest.xml