Bill Burke 0ace5cd746 merge conflicts

2014-10-09 18:26:14 -04:00

..

src

merge conflicts

2014-10-09 18:26:14 -04:00

pom.xml

Change version schema to match JBoss

2014-09-12 09:35:08 +02:00