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