Merge branch 'develop' into refactor_remote_saml_authentication
authormasensio <masensio@solidgear.es>
Wed, 15 Jan 2014 10:00:37 +0000 (11:00 +0100)
committermasensio <masensio@solidgear.es>
Wed, 15 Jan 2014 10:00:37 +0000 (11:00 +0100)

Trivial merge