Merge branch 'develop' into pinEnhancement
authormasensio <masensio@solidgear.es>
Tue, 5 May 2015 11:56:57 +0000 (13:56 +0200)
committermasensio <masensio@solidgear.es>
Tue, 5 May 2015 11:56:57 +0000 (13:56 +0200)
commit7d82231809c5073a598e6aab8c582bac63ecbf53
treed4c66de207aa591821e1a66d6d092f34576089f6
parentdcd8dde86400e2d36a25141b3ce3dfdb49965033
parent8882fb2dbdd9cfaa5f8e35d460897c763e990f70
Merge branch 'develop' into pinEnhancement
res/values/strings.xml