Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
authormasensio <masensio@solidgear.es>
Wed, 21 Aug 2013 16:24:52 +0000 (18:24 +0200)
committermasensio <masensio@solidgear.es>
Wed, 21 Aug 2013 16:24:52 +0000 (18:24 +0200)
commit4dd5a5eab0ee25dfb296dde84016a75ed7a8b277
treecb0ba8be06e7655aa2b14b5386fd3ec1eb8080bb
parent9724afda5d64a1e454c79e375abcd2ea3c5331f8
parentadcdc964c772c4cb1632bc3633e9fdf23faef530
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on