From: masensio <masensio@solidgear.es>
Date: Tue, 18 Mar 2014 13:21:26 +0000 (+0100)
Subject: Merge branch 'develop' into regular_authentication_in_saml_server
X-Git-Tag: oc-android-1.5.5~5^2~1^2~16
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/3806916a484dc1075f29e2717018291627bdfebf

Merge branch 'develop' into regular_authentication_in_saml_server
---

3806916a484dc1075f29e2717018291627bdfebf