From 3cc8d83caf0358e5ea4f7b7328bb7d7f86cd509d Mon Sep 17 00:00:00 2001
From: Alex Schroeder <alex@gnu.org>
Date: Thu, 7 Aug 2008 08:59:22 +0000
Subject: [PATCH] Resolve conflict.

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

diff --git a/ChangeLog b/ChangeLog
index df4b4cc0..7f1d2533 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,11 @@
 	* wiki.pl (ItemName): New. Strips dates from page titles.
 	(RssItem): Use it.
 
+2008-08-05  Alex Schroeder  <alex@gnu.org>
+
+	* wiki.pl (InitLinkPatterns): Change $FreeLinkPattern so that
+	pages starting with "0" are still allowed.
+
 2008-07-30  Alex Schroeder  <alex@gnu.org>
 
 	* modules/image.pl (ImageSupportRule): Provide a default alt text