Merge branch 'develop' into regular_authentication_in_saml_server
authormasensio <masensio@solidgear.es>
Mon, 17 Mar 2014 12:40:11 +0000 (13:40 +0100)
committermasensio <masensio@solidgear.es>
Mon, 17 Mar 2014 12:40:11 +0000 (13:40 +0100)
commit92c904909187722a3affc6d311265e61ba313c5b
treedf5ac53db76f34523c732b4e7f78bbb75475616a
parentd01e065586ef9df7735e8ceab342a79ea634f6a4
parent1c5754ef5145cb36b1d657bc7f84ef4a2ae362ec
Merge branch 'develop' into regular_authentication_in_saml_server