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)

Trivial merge