Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Tue, 18 Mar 2014 13:21:26 +0000 (14:21 +0100)
committermasensio <masensio@solidgear.es>
Tue, 18 Mar 2014 13:21:26 +0000 (14:21 +0100)
commit3806916a484dc1075f29e2717018291627bdfebf
tree15d46fc6b7631fb766c3e8082fb864b90369efd7
parent92c904909187722a3affc6d311265e61ba313c5b
parentee28694a31aad8cf1bc15aad94eff1523ef075a7
Merge branch 'develop' into regular_authentication_in_saml_server