Bill Burke c14d3d7963 merge conflicts		2015-09-23 21:01:47 -04:00
..
client-adapter	more	2015-09-23 20:54:27 -04:00
saml-core	merge conflicts	2015-09-23 21:01:47 -04:00
saml-protocol	more complete	2015-09-23 17:54:16 -04:00
pom.xml	merge	2015-09-17 14:06:33 -04:00