From cea054cd54d84479352a43bbabc19c9ce9af5efb Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 8 Aug 2008 04:26:12 +0000
Subject: Merge revisions 35747:35930 from trunk.

svn path=/branches/kill-bonobo/; revision=35931
---
 composer/ChangeLog | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'composer/ChangeLog')

diff --git a/composer/ChangeLog b/composer/ChangeLog
index 1eeb5bb7e2..56e33a762b 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,18 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #428384
+
+	* mail-composer.error.xml:
+	Improve buttons in the "exit-unsaved" dialog by replacing "Cancel"
+	with "Continue Editing" and "Save Message" with "Save Draft".
+	Suggested by bytesmythe.
+
+2008-07-20  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #200147
+
+	* evolution-composer.ui: Added a Template placeholder
+
 2008-07-09  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #206592
-- 
cgit v1.2.3