Merge branch 'develop' into refactor_remote_saml_authentication
authormasensio <masensio@solidgear.es>
Fri, 17 Jan 2014 13:20:14 +0000 (14:20 +0100)
committermasensio <masensio@solidgear.es>
Fri, 17 Jan 2014 13:20:14 +0000 (14:20 +0100)

Trivial merge