From: David A. Velasco <dvelasco@solidgear.es>
Date: Wed, 3 Dec 2014 10:31:49 +0000 (+0100)
Subject: Merge branch 'master' into develop
X-Git-Tag: oc-android-1.7.0_signed~89
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/50e39f044f0ac1bbd572ba9eb8178a415791a8a5?ds=sidebyside;hp=--cc

Merge branch 'master' into develop
---

50e39f044f0ac1bbd572ba9eb8178a415791a8a5
diff --cc owncloud-android-library
index 5bd0d738,0030d82e..8261865f
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 5bd0d7387712ce3f53869294761ac4d8537841cd
 -Subproject commit 0030d82ee8156eb82224eaea810e4bf6010feef1
++Subproject commit 8261865ff24c1bfc05be19ae9364a66dac8f26c3