Merge branch 'develop' into release-1.5.6
authormasensio <masensio@solidgear.es>
Tue, 27 May 2014 11:18:41 +0000 (13:18 +0200)
committermasensio <masensio@solidgear.es>
Tue, 27 May 2014 11:18:41 +0000 (13:18 +0200)
commita3a5cd4eb7e020d7a197dc266cc9d18f738266ad
treeba0ead3e69a1d07d2a5e9d7b61e0da9fdba886eb
parent476bfba9e4d52088fd479582fea86ce4924092aa
parenta139eca1260913a08eac5e8e167bb8b8a385e532
Merge branch 'develop' into release-1.5.6
res/values/strings.xml