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
..
infinispan	KEYCLOAK-1476 NotSerializableException: org.keycloak.models.cache.entities.CachedClientRole	2015-06-17 14:05:55 +02:00
model-adapters	Merge branch 'KEYCLOAK-1421' of https://github.com/velias/keycloak into velias-KEYCLOAK-1421	2015-07-02 14:15:54 +02:00
pom.xml