Merge branch 'develop' into refactor_remote_operation_to_read_folder
authormasensio <masensio@solidgear.es>
Wed, 27 Nov 2013 13:50:16 +0000 (14:50 +0100)
committermasensio <masensio@solidgear.es>
Wed, 27 Nov 2013 13:50:16 +0000 (14:50 +0100)
commit5aaa4e10e8bad5d12d3f7cfa319ab59428c2fe7f
treed5ab179ebd330fb34147fb46d1988f84e80eba52
parent40798f69ee075f3c627fc215a3c3de36c570e03e
parent910c8a7b36b98bb48d2aff44424cdb3c66693e53
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
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java