Merge tag '0.6.3' into debian/experimental

Tag soledad 0.6.3.

1 files changed, 8 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 7cf5a3b4..e3ada799 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+0.6.3 Dec 16 2014:
+Client:
+  o Fix deferred encryption/decryption parameters (#6500).
+
+0.6.2 Dec 11 2014:
+Client:
+  o Fix incorrect ssl context setup.
+
 0.6.1 Dec 08 2014:
 Client:
   o Use TLS v1 in soledad client. Fixes partially #6437