From 4187293731274274e4283d9039f6e30c95578118 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 18 Aug 2008 16:18:42 +0000
Subject: Merge revisions 35993:36015 from trunk. Adapt recent "crash recovery"
 changes to new architecture.

svn path=/branches/kill-bonobo/; revision=36018
---
 help/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'help/ChangeLog')

diff --git a/help/ChangeLog b/help/ChangeLog
index e19f019ca2..45e464a2d7 100644
--- a/help/ChangeLog
+++ b/help/ChangeLog
@@ -1,3 +1,8 @@
+2008-08-18  Matthew Barnes  <mbarnes@redhat.com>
+
+	* C/evolution.xml:
+	Remove the bit about crash recovery.
+
 2008-08-14  Jorge Gonzalez  <jorgegonz@svn.gnome.org>                        
 
 	* es/es.po: Updated Spanish translation
-- 
cgit v1.2.3