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

Trivial merge