From 4f4615a46d5ba518c1e6a0c2412b1edf1e268d99 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Mon, 24 Nov 2008 05:14:44 +0000
Subject: Merge revisions 36737:36810 from trunk.

svn path=/branches/kill-bonobo/; revision=36811
---
 plugins/itip-formatter/ChangeLog | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'plugins/itip-formatter/ChangeLog')

diff --git a/plugins/itip-formatter/ChangeLog b/plugins/itip-formatter/ChangeLog
index f408872cdc..966cc611e7 100644
--- a/plugins/itip-formatter/ChangeLog
+++ b/plugins/itip-formatter/ChangeLog
@@ -1,3 +1,10 @@
+2008-11-06  Patrick Ohly  <patrick.ohly@gmx.de>
+
+	** Fix for bug #541121
+
+	* itip-formatter.c: don't allow sending a response to meeting
+	invitation replies
+
 2008-10-20  Milan Crha  <mcrha@redhat.com>
 
 	** Fix for bug #514989
@@ -18,7 +25,7 @@
 	* itip-formatter.c: (view_response_cb):
 	Use the proper functions to traverse messages in a folder's summary.
 
-2008-10-10  Patrick Ohly  <pohly@ecld0pohly>
+2008-10-10  Patrick Ohly  <patrick.ohly@gmx.de>
 
 	** #541121: improved itip formatter: allow replying to forwarded
 	and already imported invitations; honor RVSP flag in invitation
-- 
cgit v1.2.3