From: David A. Velasco <dvelasco@solidgear.es>
Date: Fri, 23 Aug 2013 12:32:03 +0000 (+0200)
Subject: Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b... 
X-Git-Tag: oc-android-1.4.6~18^2~4
X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/ea5cd96679e66b81f9789b5667eecfc99846de1a?hp=ea5cd96679e66b81f9789b5667eecfc99846de1a

Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on
---