updated ChangeLog; obsolete fix has been removed

Conflicts:

	ChangeLog