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