changelog
Merge branch 'master' of github.com:lausser/check_ups_health

Conflicts:
	ChangeLog
	configure.ac