1 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index aafe65fab..4df742c1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-06-05  Christian Persch  <chpe@cvs.gnome.org>
+
+	* configure.in:
+	* help/es/epiphany.xml:
+
+	Merged from HEAD.
+
 2004-06-02  Christian Persch  <chpe@cvs.gnome.org>
 
 	* configure.in: