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)
commit7f6c5bd3b2d0396a838168cd5e3f622b16239e67
treea6bb3596c9df3345a97c795d67a4c6235c4d23a4
parent9d491f71ed58ff46d64f0cdfe9b9245171c31d4b
parentd54345d0403a4ea2214b793b24ba0e821ea1339c
Merge commit 'refs/pr/701' into create_folder_during_upload_pr_701_with_develop
res/values/strings.xml