Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Mon, 17 Mar 2014 12:40:11 +0000 (13:40 +0100)
committermasensio <masensio@solidgear.es>
Mon, 17 Mar 2014 12:40:11 +0000 (13:40 +0100)

Trivial merge