Stian Thorgersen 0c7f63b2f3 Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master ... Conflicts: services/src/main/java/org/keycloak/services/resources/admin/RealmAdminResource.java		2015-05-18 06:56:12 +02:00
..
src	Merge branch 'master' of https://github.com/girirajsharma/keycloak into girirajsharma-master	2015-05-18 06:56:12 +02:00
pom.xml	Version bump	2015-05-05 11:45:21 +02:00