Merge branch 'fixed_contradicted_messages_in_login_view' into develop
[pub/Android/ownCloud.git] / tests / res /
2012-09-29 Bartek Przybylskijunit for android app