Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Thu, 20 Mar 2014 08:02:29 +0000 (09:02 +0100)
committermasensio <masensio@solidgear.es>
Thu, 20 Mar 2014 08:02:29 +0000 (09:02 +0100)

Trivial merge