4 commits

Author	SHA1	Message	Date
Bill Burke	39381c104c	merge fixes	2014-05-06 10:07:48 -04:00
Stian Thorgersen	1d760388de	KEYCLOAK-441 Remove org.json	2014-05-06 12:32:29 +01:00
Bill Burke	75224d25b0	remove picketlink dependencies	2014-05-05 18:50:41 -04:00
Bill Burke	e7c64b7812	adatper deployment context fixes, picketlink abstraction	2014-05-05 18:20:52 -04:00