Merge branch 'master' into text_file_preview_pr_707_with_develop
[pub/Android/ownCloud.git] / tests / res / values / strings.xml
2012-09-29 Bartek Przybylskijunit for android app