From 7163be96e0b4317043b1965f719e1d3203957fbd Mon Sep 17 00:00:00 2001
From: Yann Leboulanger <asterix@lagaule.org>
Date: Mon, 22 Dec 2008 10:38:05 +0000
Subject: backport diff from 0.12 branch

---
 ChangeLog | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 19a5fa40f..2c0637605 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Gajim 0.12.1 (21 December 2008)
+
+  * Fix filetransfer
+  * Updated german translation
+  * Fix click on notifications when text string is empty
+  * Improve systray popup menu
+
 Gajim 0.12 (17 December 2008)
 
   * Fix text rendering in notifications
-- 
cgit v1.2.3