Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Wed, 19 Mar 2014 16:57:56 +0000 (17:57 +0100)
committermasensio <masensio@solidgear.es>
Wed, 19 Mar 2014 16:57:56 +0000 (17:57 +0100)
commit432d696432b5a86aa81d510b01a9db2ca26c2164
treead7dd5a74d4cffd815214794707e4d6c5c2c590f
parent71e049394eabbde1a8bd43c53a074750ee3c4be2
parentf5a9c9600edc35f2e5e21d1751a09ff1241c0876
Merge branch 'develop' into regular_authentication_in_saml_server