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

Merge branch 'develop' into refactor_remote_saml_authentication
---

b5ca58b712f9404d0afa00a7915ec183fa3ea29a