Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Wed, 19 Mar 2014 07:55:37 +0000 (08:55 +0100)
committermasensio <masensio@solidgear.es>
Wed, 19 Mar 2014 07:55:37 +0000 (08:55 +0100)
commit3e108163bca94944dab7881b6ad7e92b787036ca
tree95c88f180e78d6b20cb50463185d2075d3e3d431
parent705bee08fa4e77f399049afc1e2ffe81ce481d6f
parentd3980d480fc8b343401ff9fdf0c2dcdb6d7b7dff
Merge branch 'develop' into regular_authentication_in_saml_server