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
commit22e93b521732ee0fa54262c403c3343d26922a6b (patch)
tree31f4b2e7d3eb3600cda664c222ac6fd27a33798c
parent48c00a27fae15f7a9d7a2408468c907cb0f1873c (diff)
Fold in changes
-rw-r--r--mail/CHANGELOG6
-rw-r--r--mail/changes/better_charset_handling2
-rw-r--r--mail/changes/return_smtp_port2
3 files changed, 6 insertions, 4 deletions
diff --git a/mail/CHANGELOG b/mail/CHANGELOG
index fb62efd..45f1a7f 100644
--- a/mail/CHANGELOG
+++ b/mail/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/mail/changes/better_charset_handling b/mail/changes/better_charset_handling
deleted file mode 100644
index 832f7b2..0000000
--- a/mail/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/mail/changes/return_smtp_port b/mail/changes/return_smtp_port
deleted file mode 100644
index 1cf58ef..0000000
--- a/mail/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