Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop
authormasensio <masensio@solidgear.es>
Fri, 30 Jan 2015 11:10:15 +0000 (12:10 +0100)
committermasensio <masensio@solidgear.es>
Fri, 30 Jan 2015 11:10:15 +0000 (12:10 +0100)
1  2 
res/values/strings.xml

Simple merge