From: Magnus Sjoqvist <magnus.b.j.sjoqvist@gmail.com>
Date: Tue, 11 Nov 2014 11:49:22 +0000 (+0100)
Subject: merge
X-Git-Tag: oc-android-1.7.0_signed~69^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/437d3315e00d072ff72e23800947abeec2a0fee2?ds=inline;hp=--cc

merge
---

437d3315e00d072ff72e23800947abeec2a0fee2
diff --cc owncloud-android-library
index 99f8c869,4f315c7e..d7097983
--- a/owncloud-android-library
+++ b/owncloud-android-library
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 99f8c869702a3261d9868207968700277e208507
 -Subproject commit 4f315c7e06f6eef48df246be0ee9252fdfccdf00
++Subproject commit d7097983594347167b5bde3fa5b2b4ad1d843392