Stian Thorgersen db20077c37 Merge branch 'KEYCLOAK-1421' of https://github.com/velias/keycloak into velias-KEYCLOAK-1421 ... Conflicts: testsuite/integration/src/test/java/org/keycloak/testsuite/model/UserModelTest.java		2015-07-02 14:15:54 +02:00
..
main	Merge branch 'KEYCLOAK-1421' of https://github.com/velias/keycloak into velias-KEYCLOAK-1421	2015-07-02 14:15:54 +02:00
test	username mapper	2015-05-08 20:41:31 -04:00