changelog surgery, remove the conflict that has been there for 7 month
authorEdward Hervey <bilboed@bilboed.com>
Mon, 4 Dec 2006 19:54:19 +0000 (19:54 +0000)
committerEdward Hervey <bilboed@bilboed.com>
Mon, 4 Dec 2006 19:54:19 +0000 (19:54 +0000)
commit3fb94f72dc27449c89ff6bcabb0e6282dad88777
tree8680c72353f9cdac95a41d5be98ad53f996a3075
parentd79b29c4077e93fa4ab6fd2675b3385bbf2c32b7
changelog surgery, remove the conflict that has been there for 7 month

Original commit message from CVS:
changelog surgery, remove the conflict that has been there for 7 month
ChangeLog