query
Merge branch 'master' of https://github.com/tvillemo/genindex.git

Conflicts:
	.classpath