Diederik Muylwyk 3e173bb07c Merging master into working branch to resolve conflicts. ... # Conflicts: # src/changes/changes.xml		2019-09-26 20:19:22 -04:00
..
src	Merging master into working branch to resolve conflicts.	2019-09-26 20:19:22 -04:00
.gitignore	Remove redundant files	2016-09-21 16:59:43 -04:00
pom.xml	Fix intermittent test failures regarding search (#1509)	2019-09-25 20:15:21 -04:00