From 9378f533f80f2a7f5f554f5bd1323e47abce9316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 9 Aug 2013 14:47:14 -0300
Subject: Fold in changes

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

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index 3338d5b6..057a46cc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,12 @@
+0.3.0 Aug 9:
+Client:
+  o Thread safe wrapper for pysqlcipher.
+  o Fix a couple of typos that prevented certain functionality to
+    work. Fixes #3306
+Server:
+  o A plaintext port is not opened by soledad server initscript call
+    to twistd web anymore. Closes #3254.
+
 0.2.3 Jul 26:
 Client:
   o Avoid possible timing attack in document's mac comparison by
-- 
cgit v1.2.3