Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
authormasensio <masensio@solidgear.es>
Fri, 23 Aug 2013 07:11:42 +0000 (09:11 +0200)
committermasensio <masensio@solidgear.es>
Fri, 23 Aug 2013 07:11:42 +0000 (09:11 +0200)
commit92c4528bdf2bb2fb7681b9e52f2b72765cc77c80
tree24e705dadfd2058725ddd7e2820d1f6925b1dd21
parent913a74d9f833da925b2b6d7ec3011dbd82666fc9
parentb04c3e2398de4f48c8ab3bda3871d44409ee8d74
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on