Fix commit conflicts.
authorEli Zaretskii <eliz@gnu.org>
Sat, 15 Jan 2005 11:48:58 +0000 (11:48 +0000)
committerEli Zaretskii <eliz@gnu.org>
Sat, 15 Jan 2005 11:48:58 +0000 (11:48 +0000)
commit3c86abc0b617b1984a47e4245f56ee078679ae5c
tree19d5cd173135f1b4a8188122e20f62ad0919ca91
parent64819146e92620ce3327204d53969e49845770e0
Fix commit conflicts.
man/ChangeLog