From ab00f5b08adb1d74a0c70d935a32ffd982e86f34 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@src.gnome.org>
Date: Wed, 21 Jan 2009 02:52:05 +0000
Subject: Merge revisions 37075:37107 from trunk.

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

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index f871642b73..c115e635f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-10-19  Matthew Barnes  <mbarnes@redhat.com>
+
+	* configure.in:
+	Keep evolution and evolution-data-server versions in lockstep
+	from now on to avoid any more dependency screw ups.
+
+2009-01-15  Bharath Acharya  <abharath@novell.com>
+
+	** Fix for bug #208426
+
+	* configure.in: Added support for importing .pst files into Evolution.
+
 2009-01-12  Philip Van hoof  <philip@codeminded.be>
 
 	* e-util/e-plugin.c
-- 
cgit v1.2.3