From: jabarros <jabarros@solidgear.es>
Date: Mon, 20 Oct 2014 12:54:46 +0000 (+0200)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~140
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3a8ff76d0a68d0ba18513c177b69bb8cb38e4189

Merge branch 'master' into develop

Conflicts:
	owncloud-android-library
---

3a8ff76d0a68d0ba18513c177b69bb8cb38e4189
diff --cc owncloud-android-library
index c29631b8,d7097983..5bd0d738
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit c29631b8bfea22e5f0b448aab8ffff959ae4de66
 -Subproject commit d7097983594347167b5bde3fa5b2b4ad1d843392
++Subproject commit 5bd0d7387712ce3f53869294761ac4d8537841cd