Merge branch 'develop' into refactor_remote_saml_authentication
authormasensio <masensio@solidgear.es>
Thu, 9 Jan 2014 09:04:04 +0000 (10:04 +0100)
committermasensio <masensio@solidgear.es>
Thu, 9 Jan 2014 09:04:04 +0000 (10:04 +0100)

Trivial merge