Merge ChangeLog from trunk better.
commit57f53182c004f51e47818d70968a07579440eaff
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 08:40:41 +0000 (2 01:40 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 2 Jun 2011 08:40:41 +0000 (2 01:40 -0700)
treed72c39a7aa28f67bc63d8153df49c94d7b03bea0
parent7f5efba80e3643683eb050205054b7896342aa2d
Merge ChangeLog from trunk better.
ChangeLog
src/ChangeLog