ChangeLog merge fix
commitf297fced4e9507c05531f7815d329435e80e8d85
authorGlenn Morris <rgm@gnu.org>
Fri, 3 Oct 2014 16:05:12 +0000 (3 09:05 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 3 Oct 2014 16:05:12 +0000 (3 09:05 -0700)
treec4f7b3af607251edd47411d4ffed46c8e2e931c5
parentb5b3a119bab7e18a455509fcb35b871a8f580eb6
ChangeLog merge fix
Yet another unlabelled backport.
src/ChangeLog