Merge branch 'develop' into regular_authentication_in_saml_server
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Mar 2014 10:02:36 +0000 (11:02 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 21 Mar 2014 10:02:36 +0000 (11:02 +0100)
commita3bf6883fc8182030bd9304e289a4a2d80f7e1f2
treebb297ab4c6d277fe96f9a18f4eddc20a4c90b90c
parentd18c52730ebf60ea221979f49b26bbed81ed23b5
parentea3cf3434904c0ba4b938f918dc13c47ce624207
Merge branch 'develop' into regular_authentication_in_saml_server