Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
authormasensio <masensio@solidgear.es>
Wed, 21 Aug 2013 16:24:52 +0000 (18:24 +0200)
committermasensio <masensio@solidgear.es>
Wed, 21 Aug 2013 16:24:52 +0000 (18:24 +0200)

Trivial merge