Add a ChangeLog entry for the latest merge.