Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Tue, 18 Mar 2014 13:21:26 +0000 (14:21 +0100)
committermasensio <masensio@solidgear.es>
Tue, 18 Mar 2014 13:21:26 +0000 (14:21 +0100)

Trivial merge