From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 7 Aug 2015 08:17:03 +0000 (+0200)
Subject: Merge branch 'develop'
X-Git-Tag: oc-android-1.8~27^2~6
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/537e075fca51a81570d7de702ced3eea4838da51?hp=-c

Merge branch 'develop'

Conflicts FIXED:
	owncloud-android-library
---

537e075fca51a81570d7de702ced3eea4838da51
diff --combined owncloud-android-library
index e71ba7fa,c8f6e5ad..dbc8c325
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit e71ba7faee2b24b285a05fae6a596cf8d5e76b33
 -Subproject commit c8f6e5ad57ee27fdac39c7b14eb6ab1942a92d49
++Subproject commit dbc8c325d74f3f7e8da8236c5abe77a141ae4019