From a4bb4f2c875e69a78ef5eb0b117c0ef583d427ab Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Fri, 20 May 2011 17:11:04 +0200
Subject: [PATCH] update changelog from 0.14 branch

---
 ChangeLog | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d3679a9490..2b73919447 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
-Gajim 0.14 (XX)
+Gajim 0.14.1 (26 October 2010)
+
+  * Fix changing account name
+  * Fix sending XHTML
+  * Fix GnomeKayring usage
+  * Fix some GPG bugs
+  * Minor bugfixes
+
+Gajim 0.14 (02 September 2010)
 
   * Jingle audio / video chat
   * Improve Startup time
-- 
GitLab