Merge remote-tracking branch 'origin/saml_based_federated_single_sign_on' into saml_b...
authormasensio <masensio@solidgear.es>
Fri, 23 Aug 2013 07:11:42 +0000 (09:11 +0200)
committermasensio <masensio@solidgear.es>
Fri, 23 Aug 2013 07:11:42 +0000 (09:11 +0200)

Trivial merge