Bill Burke 38a2ea2fdf fix merge conflict mistakes		2015-06-15 09:28:11 -04:00
..
infinispan	Bump version	2015-06-12 14:35:34 +02:00
model-adapters	fix merge conflict mistakes	2015-06-15 09:28:11 -04:00
pom.xml	Bump version	2015-06-12 14:35:34 +02:00