From aee8e814dd65b99b06b1c38bd81169baaf146bcf Mon Sep 17 00:00:00 2001
From: Christian Persch <chpe@cvs.gnome.org>
Date: Mon, 29 Mar 2004 15:15:21 +0000
Subject: Merge fix for bug #138207 from HEAD.

2004-03-29  Christian Persch  <chpe@cvs.gnome.org>

	* data/ui/epiphany-ui.xml:

	Merge fix for bug #138207 from HEAD.
---
 ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 69e9c801b..551e23c66 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-29  Christian Persch  <chpe@cvs.gnome.org>
+
+	* data/ui/epiphany-ui.xml:
+
+	Merge fix for bug #138207 from HEAD.
+
 2004-03-29  Christian Persch  <chpe@cvs.gnome.org>
 
 	* configure.in:
-- 
cgit v1.2.3