Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired...
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 12:33:23 +0000 (14:33 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 12:33:23 +0000 (14:33 +0200)
commit43660cb8bd43938bec7ed8529b2bbbde64acbe8f
treed48c4533ec8ed94c96a804acb71782e3bfeffc05
parent8aa08be8706131a60f3a249c4ac9d326d4dfde53
parent71347b48a089a677d7799628abf4056bbd780d71
Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on_expired' into saml_based_federated_single_sign_on_expired