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/groupwise-features/ChangeLog | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'plugins/groupwise-features/ChangeLog')

diff --git a/plugins/groupwise-features/ChangeLog b/plugins/groupwise-features/ChangeLog
index 202ce94ffa..884301b517 100644
--- a/plugins/groupwise-features/ChangeLog
+++ b/plugins/groupwise-features/ChangeLog
@@ -1,3 +1,14 @@
+2008-10-17  Matthew Barnes  <mbarnes@redhat.com>
+
+	* send-options.c (org_gnome_send-options):
+	Don't mix declarations and statements.
+
+2008-10-03  Sankar P  <psankar@novell.com>
+
+License Changes
+
+	* proxy-login.c:
+
 2008-10-01  Gabor Kelemen  <kelemeng@gnome.hu>
 
 	*  send-options.c: Mark two forgotten strings for translation. Fixes bug #553070
-- 
cgit v1.2.3