Merge branch 'develop' into refactor_remote_saml_authentication
authormasensio <masensio@solidgear.es>
Tue, 14 Jan 2014 10:12:31 +0000 (11:12 +0100)
committermasensio <masensio@solidgear.es>
Tue, 14 Jan 2014 10:12:31 +0000 (11:12 +0100)

Trivial merge