Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired...
authormasensio <masensio@solidgear.es>
Sat, 17 Aug 2013 08:33:00 +0000 (10:33 +0200)
committermasensio <masensio@solidgear.es>
Sat, 17 Aug 2013 08:33:00 +0000 (10:33 +0200)
commit595f9b8ecda5ce46fb4df0d71a8cd862abd76881
treebb25b032ba82320927b707ab29b499215d9efe84
parent60947d737c6936081f7469f8e594942c81f0b5ff
parent503743fa0d067f7f0913412fb4ba8228e5a29bda
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired