From: masensio <masensio@solidgear.es>
Date: Wed, 18 Dec 2013 09:04:42 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_operation_to_download_file
X-Git-Tag: oc-android-1.5.5~100^2
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/71430eb7b15c982cb6b634efa5cac8348b2cd22c?hp=71430eb7b15c982cb6b634efa5cac8348b2cd22c

Merge branch 'develop' into refactor_remote_operation_to_download_file

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