From 7a8c2284117adcb6d2fd86f62b6423fb8d9b1460 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 4 Oct 2013 11:18:30 -0300
Subject: Fold in changes

---
 CHANGELOG                   | 3 +++
 changes/feature_cert-bundle | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 changes/feature_cert-bundle

diff --git a/CHANGELOG b/CHANGELOG
index d999d08..31ac8f0 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.3.4 Oct 4:
+  o Add cert bundle including ca-cert certificate. Closes #3850.
+
 0.3.3 Sep 20:
   o Fix events server exception raising when port is occupied by some
     other process. Closes #3515.
diff --git a/changes/feature_cert-bundle b/changes/feature_cert-bundle
deleted file mode 100644
index a849efb..0000000
--- a/changes/feature_cert-bundle
+++ /dev/null
@@ -1 +0,0 @@
-  o Add cert bundle including ca-cert certificate. Closes: #3850
-- 
cgit v1.2.3