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)
1  2 
res/values/strings.xml

Simple merge