From f7c0fdbaee0ca5a2bb712e2b6c9aaee1df3333d2 Mon Sep 17 00:00:00 2001
From: Alex Schroeder <alex@gnu.org>
Date: Fri, 20 Apr 2007 20:43:06 +0000
Subject: [PATCH] Merge

---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 72a982be..289a205b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-04-20  Alex Schroeder  <alex@gnu.org>
+
+	* wiki.pl (DoContributors): Rewrite to avoid garbage entries.
+	(MergeRevisions): Put the texts in double quotes in order to
+	support translations containing spaces.
+
 2007-04-18  Alexander Uvizhev  <uvizhe@yandex.ru>
 
 	* modules/linktagmap.pl: Many changes. This module now works