From: masensio <masensio@solidgear.es>
Date: Mon, 18 Nov 2013 13:42:07 +0000 (+0100)
Subject: t puswqMerge branch 'refactor_remote_operation_to_create_folder' into refactor_remote... 
X-Git-Tag: oc-android-1.5.5~123^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/515ec5e8dd751956264dffdb1b5db65eda0aed8a?hp=515ec5e8dd751956264dffdb1b5db65eda0aed8a

t puswqMerge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder

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