ChangeLog merge fix
commit2ae68b8b152f7fcc987c9efd0eacf6b768703b71
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)
tree519ee9f1b0611135bcdab2a976367d94b5962eb3
parent79a90058ec11dbb56665e85a6631e4b8b5e7a6c6
ChangeLog merge fix
Yet another unlabelled backport.
src/ChangeLog