Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Mon, 24 Mar 2014 08:31:43 +0000 (09:31 +0100)
committermasensio <masensio@solidgear.es>
Mon, 24 Mar 2014 08:31:43 +0000 (09:31 +0100)

Trivial merge