summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-04 11:18:30 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-04 11:18:30 -0300
commit7a8c2284117adcb6d2fd86f62b6423fb8d9b1460 (patch)
treeb2b484aad5a86de87aea57db2728b90f546cf48a
parent0d3cd5693787d39d611307e673170449ed80704b (diff)
Fold in changes
-rw-r--r--CHANGELOG3
-rw-r--r--changes/feature_cert-bundle1
2 files changed, 3 insertions, 1 deletions
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