From c0a255eb90769638d57ae4122932f75c46e4e531 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Thu, 11 Sep 2008 15:34:29 +0000
Subject: Merge revisions 36016:36303 from trunk.

svn path=/branches/kill-bonobo/; revision=36307
---
 plugins/email-custom-header/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'plugins/email-custom-header/ChangeLog')

diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index 2c992a4fac..f69ba35622 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	* email-custom-header.c:
+	Don't mix declarations and code.
+
 2008-08-14  Matthew Barnes  <mbarnes@redhat.com>
 
 	* gui/contact-editor/e-contact-editor.c:
-- 
cgit