tnst
Merge branch 'master' of https://github.com/quaeldurn/esja

Conflicts:
	esja.c