Merge branch 'master' into saml_based_federated_single_sign_on
authormasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:19:37 +0000 (10:19 +0200)
committermasensio <masensio@solidgear.es>
Mon, 26 Aug 2013 08:19:37 +0000 (10:19 +0200)

Trivial merge