From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 15 Apr 2015 10:16:24 +0000 (+0200)
Subject: Merge branch 'develop' into upgrading_account_manager
X-Git-Tag: test~30^2~12^2~1
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/4457dbd3177fb6084f801187c35e09008bcd3b50?ds=inline;hp=--cc

Merge branch 'develop' into upgrading_account_manager
---

4457dbd3177fb6084f801187c35e09008bcd3b50
diff --cc owncloud-android-library
index 21c329aa,9e761387..2e993f98
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 21c329aa126833119f4bc6ed06a3f3881964246f
 -Subproject commit 9e761387a0b406402684571f28c36c2d6d2b6301
++Subproject commit 2e993f9893739ca4bf0883b881b125030a9cad26