Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Wed, 19 Mar 2014 16:57:56 +0000 (17:57 +0100)
committermasensio <masensio@solidgear.es>
Wed, 19 Mar 2014 16:57:56 +0000 (17:57 +0100)

Trivial merge