Phillip Webb 6f62fc854b Merge branch '1.1.x'

2014-09-03 11:45:54 -07:00

..

src

Add group discriminant in case of conflict

2014-09-03 11:22:53 -07:00

pom.xml

Switch master to 1.2.0.BUILD-SNAPSHOT

2014-07-11 10:44:05 +02:00