Merge branch 'master' into debian

1 files changed, 15 insertions, 0 deletions

diff --git a/Changelog b/Changelog
index acd02d2..5b010d2 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,18 @@
+interimap (0.2) upstream
+
+  * Add support for the IMAP COMPRESS extension [RFC4978].  By default
+    enabled for the remote server, and disabled for the local server.
+  * Add traffic statistics after closing the connection to the IMAP
+    server.
+  * Add a configuration option 'null-stderr=YES' to send STDERR to
+    /dev/null for type=tunnel.
+  * Add support for the Binary Content extension [RFC3516].  Enabled by
+    default if both the local and remote servers advertize "BINARY".
+	Can be disabled by adding 'use-binary=NO' to the default section in
+	the configuration file.
+
+ -- Guilhem Moulin <guilhem@guilhem.org>  Wed, 09 Sep 2015 00:44:35 +0200
+
 interimap (0.1) upstream;
 
   * Initial public release.  Development was started in July 2015.