Edit changelog a bit.
Remove bug12693 changelog entry.

It looks like this was stale and sitting around uncommitted in my
changes directory, having not been committed on my bug12693_025
branch.  The fix for bug12693_025 is not in fact merged.