Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Thu, 20 Mar 2014 08:02:29 +0000 (09:02 +0100)
committermasensio <masensio@solidgear.es>
Thu, 20 Mar 2014 08:02:29 +0000 (09:02 +0100)
commit09cc36272b9307f891605439ba877864c1c5b791
tree36d36d8240d61e42f46705c770a5f7f2e34a4ee2
parent432d696432b5a86aa81d510b01a9db2ca26c2164
parent53fbd428aff10c5ad757d9c4fa79ea78491fa1ef
Merge branch 'develop' into regular_authentication_in_saml_server