From 7bffd3413f09467e6953c9e561e568eec9e4a325 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@novell.com>
Date: Mon, 17 Dec 2007 20:14:20 +0000
Subject: Version bump to 2.21.5

2007-12-18  Srinivasa Ragavan  <sragavan@novell.com>

	* configure.in: Version bump to 2.21.5

svn path=/trunk/; revision=34727
---
 ChangeLog | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 23ca97c49c..08b766a68b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,16 @@
-<<<<<<< .mine
+2007-12-18  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* configure.in: Version bump to 2.21.5
+
 2007-12-17  Srinivasa Ragavan  <sragavan@novell.com>
 
 	* NEWS, configure.in: evolution 2.21.4 release.
 
-=======
 2007-12-17  Matthew Barnes  <mbarnes@redhat.com>
 
 	* configure.in:
 	Bump eds_minimum_version to 2.21.4 for new Camel functions.
 
->>>>>>> .r34724
 2007-12-15  Matthew Barnes  <mbarnes@redhat.com>
 
 	* configure.in:
-- 
cgit v1.2.3