Remove conflict markers and fix entries for 2012-09-01T06:38:52Z!dancol@dancol.org.
authorEli Zaretskii <eliz@gnu.org>
Sat, 1 Sep 2012 12:23:50 +0000 (15:23 +0300)
committerEli Zaretskii <eliz@gnu.org>
Sat, 1 Sep 2012 12:23:50 +0000 (15:23 +0300)
commitf18cbb28c26c300dbe37de6950d4ef918de9c61b
treea3239774f370b6ecb590ba4b1dc1ea91845cc44d
parent25eac50084cbfda539894cedede5893656cdac2d
Remove conflict markers and fix entries for 2012-09-01T06:38:52Z!dancol@dancol.org.
src/ChangeLog