Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Mon, 24 Mar 2014 08:31:43 +0000 (09:31 +0100)
committermasensio <masensio@solidgear.es>
Mon, 24 Mar 2014 08:31:43 +0000 (09:31 +0100)
commit1bda7e1e872273e48cc5bf1ae8f289e6d03f00ab
treec30f3009bb93f914d3afdb235573b8aba19e94ad
parentdca770be6a99163de9ee1c7909034f3f1931d96c
parent8a1bcd8159c92e93eac425d3da46af5e5cb112df
Merge branch 'develop' into regular_authentication_in_saml_server