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)
commitf4dc4e45f8001a2f8080dbcd49f84e4b23e926cd
tree0d1970c61eb634472d582b53cc9dee8f0f05aa23
parentc535af9942b8785e8b553d7024753a71c48e4c56
parent03fb21540a043ab727cc6b559402f273d3a77321
Merge branch 'develop' into refactor_remote_saml_authentication