Stephane Nicoll 363798e9ad Fix unresolved merge commit ... Closes gh-7206		2016-10-23 07:51:08 +02:00
..
src	Fix unresolved merge commit	2016-10-23 07:51:08 +02:00
pom.xml	Merge branch '1.5.x'	2016-10-12 10:37:38 +02:00