From 02e37e94028c9da2d6105431ade167ae8f8e6fe8 Mon Sep 17 00:00:00 2001
From: Jeremy Lainé <jeremy.laine@m4x.org>
Date: Mon, 30 Jul 2012 09:03:04 +0200
Subject: feed changelog

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index 74fdc6f1..a4ce6b10 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+QXmpp 0.6.4 (UNRELEASED)
+------------------------
+
+  - Fix issues:
+    * Issue 144: QXmppBookmarkConference autojoin parsing
+
 QXmpp 0.6.3 (Jul 24, 2012)
 --------------------------
 
-- 
cgit v1.2.3