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)

Trivial merge