From: masensio Date: Fri, 23 Aug 2013 07:09:40 +0000 (+0200) Subject: Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on X-Git-Tag: oc-android-1.4.6~18^2~4^2~2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/913a74d9f833da925b2b6d7ec3011dbd82666fc9 Merge remote-tracking branch 'origin' into saml_based_federated_single_sign_on --- 913a74d9f833da925b2b6d7ec3011dbd82666fc9