From: masensio <masensio@solidgear.es>
Date: Fri, 17 Jan 2014 13:20:14 +0000 (+0100)
Subject: Merge branch 'develop' into refactor_remote_saml_authentication
X-Git-Tag: oc-android-1.5.5~73^2~3
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/5581bd9c117472432c6897d9376ecf1dc0131ba6?hp=-c

Merge branch 'develop' into refactor_remote_saml_authentication
---

5581bd9c117472432c6897d9376ecf1dc0131ba6