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