Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat...
authormasensio <masensio@solidgear.es>
Thu, 14 Nov 2013 16:23:25 +0000 (17:23 +0100)
committermasensio <masensio@solidgear.es>
Thu, 14 Nov 2013 16:23:25 +0000 (17:23 +0100)
commitf299079851589e2af2d4aa93a77eecda6438b004
treea37f7b3666f9d2f08a275e7ab659b6dcf727b3fb
parent9b79ed71c376b23cc401b0b224e693c099104126
parent15442976fed24e18f3f21d3edcc0e96a774b0de3
Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder

Conflicts:
oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java