From 85b2913a380c69f14ae0254ad23b10fabfb33667 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Fri, 24 Oct 2008 23:52:05 +0000
Subject: Merge revisions 36534:36684 from trunk.

svn path=/branches/kill-bonobo/; revision=36685
---
 plugins/templates/ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'plugins/templates/ChangeLog')

diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog
index f0fc942dc0..789f58de0b 100644
--- a/plugins/templates/ChangeLog
+++ b/plugins/templates/ChangeLog
@@ -1,3 +1,12 @@
+2008-10-15  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #556284
+
+	* templates.c: (reply_with_template), (org_gnome_templates_popup),
+	(action_template_cb): Fixes for fetching the store using 
+	mail_component_peek_local_store. Fixes the right-click crash issues 
+	caused on OS_WIN32 by Templates plugin.
+
 2008-09-15  Sankar P  <psankar@novell.com>
 
 License Changes
-- 
cgit v1.2.3