From: masensio Date: Wed, 15 Jan 2014 10:00:37 +0000 (+0100) Subject: Merge branch 'develop' into refactor_remote_saml_authentication X-Git-Tag: oc-android-1.5.5~73^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/e65985bd33956fd20547e6cf4c6cb6875eb57171?hp=--cc Merge branch 'develop' into refactor_remote_saml_authentication --- e65985bd33956fd20547e6cf4c6cb6875eb57171