summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-04 11:46:49 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-04 11:46:49 -0300
commitfdf28dc83babe9b511e9c01eb5f0c79fc8fb9faa (patch)
treea6c9d777907510dee23a79ec476c3ccf2635d7bb
parentae9f21073cb166192f4eaa71d02f03da5d9f369d (diff)
Fold in changes
-rw-r--r--CHANGELOG6
-rw-r--r--changes/better_charset_handling2
-rw-r--r--changes/return_smtp_port2
3 files changed, 6 insertions, 4 deletions
diff --git a/CHANGELOG b/CHANGELOG
index fb62efd..45f1a7f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+0.3.4 Oct 4:
+ o Improve charset handling when exposing mails to the mail
+ client. Related to #3660.
+ o Return Twisted's smtp Port object to be able to stop listening to
+ it whenever we want. Related to #3873.
+
0.3.3 Sep 20:
o Remove cleartext mail from logs. Closes: #3877.
diff --git a/changes/better_charset_handling b/changes/better_charset_handling
deleted file mode 100644
index 832f7b2..0000000
--- a/changes/better_charset_handling
+++ /dev/null
@@ -1,2 +0,0 @@
- o Improve charset handling when exposing mails to the mail client. Related to
- #3660.
diff --git a/changes/return_smtp_port b/changes/return_smtp_port
deleted file mode 100644
index 1cf58ef..0000000
--- a/changes/return_smtp_port
+++ /dev/null
@@ -1,2 +0,0 @@
- o Return Twisted's smtp Port object to be able to stop listening to
- it whenever we want. Related to #3873. \ No newline at end of file