From: masensio <masensio@solidgear.es>
Date: Thu, 9 Jan 2014 09:04:04 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_saml_authentication
X-Git-Tag: oc-android-1.5.5~73^2~12
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f4dc4e45f8001a2f8080dbcd49f84e4b23e926cd?ds=inline

Merge branch 'develop' into refactor_remote_saml_authentication
---

f4dc4e45f8001a2f8080dbcd49f84e4b23e926cd