Fix ChangeLog to reflect merge better.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Jul 2011 04:58:22 +0000 (21:58 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 10 Jul 2011 04:58:22 +0000 (21:58 -0700)
commit99033785c7adac8711cc7c56a99c4e3b441648b1
tree2926349e2bc296694811931fdd9acd45af519a99
parent0f5860c118b3beb1c6acd56de08deff4b3d1c2d1
Fix ChangeLog to reflect merge better.
src/ChangeLog