Fold in changes

1 files changed, 7 insertions, 0 deletions

diff --git a/CHANGELOG b/CHANGELOG
index 9de1ed7..04833b4 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+0.3.6 Apr 4:
+  o Use CouchDocument to comply with new Soledad couch backend. Fixes
+    #4475.
+  o Some emails are multipart and each part has its own encoding.
+
+-- 2014 --
+
 0.3.5 Dec 10:
   o Add X-Leap-Provenance header. Closes #4356.
   o Add tester script to ease testing problematic emails offline.