Merge branch 'develop' into refactor_remote_operation_to_download_file
authormasensio <masensio@solidgear.es>
Wed, 18 Dec 2013 09:04:42 +0000 (10:04 +0100)
committermasensio <masensio@solidgear.es>
Wed, 18 Dec 2013 09:04:42 +0000 (10:04 +0100)
commit71430eb7b15c982cb6b634efa5cac8348b2cd22c
treed628542b832760423bd5ecabd72e59c081a8623f
parent023f0edb40b344f0d0ade796ed49ea06202ba168
parent1638de66f717c2b4438d92a4259bd2a974b01a7d
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
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java