Merge branch 'develop' into create_folder_during_upload_pr_701_with_develop
authormasensio <masensio@solidgear.es>
Fri, 20 Mar 2015 13:55:48 +0000 (14:55 +0100)
committermasensio <masensio@solidgear.es>
Fri, 20 Mar 2015 13:55:48 +0000 (14:55 +0100)
1  2 
res/values/strings.xml

Simple merge