From: masensio <masensio@solidgear.es>
Date: Wed, 27 Nov 2013 13:50:16 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_operation_to_read_folder
X-Git-Tag: oc-android-1.5.5~116^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5aaa4e10e8bad5d12d3f7cfa319ab59428c2fe7f?hp=5aaa4e10e8bad5d12d3f7cfa319ab59428c2fe7f

Merge branch 'develop' into refactor_remote_operation_to_read_folder

Conflicts:
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
---