Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 07:08:51 +0000 (09:08 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 07:08:51 +0000 (09:08 +0200)
commit8aa08be8706131a60f3a249c4ac9d326d4dfde53
tree08d8eafc0588fb1d737cf7256741f61d57ba3d4c
parent2dc5cc57f12cf2832f6b19ee52f87e9f1f313eaa
parentb04c3e2398de4f48c8ab3bda3871d44409ee8d74
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired