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