From 7871d32da44d63a5fc89ddd14bade21a324c484b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 1 Nov 2013 10:29:03 -0300
Subject: Fold in changes

---
 CHANGELOG                       | 3 +++
 changes/bug_refactor_mail_utils | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)
 delete mode 100644 changes/bug_refactor_mail_utils

diff --git a/CHANGELOG b/CHANGELOG
index 31ac8f0..796e025 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+0.3.5 Nov 1:
+  o Move get_email_charset to this module.
+
 0.3.4 Oct 4:
   o Add cert bundle including ca-cert certificate. Closes #3850.
 
diff --git a/changes/bug_refactor_mail_utils b/changes/bug_refactor_mail_utils
deleted file mode 100644
index ea17203..0000000
--- a/changes/bug_refactor_mail_utils
+++ /dev/null
@@ -1 +0,0 @@
-  o Move get_email_charset to this module.
\ No newline at end of file
-- 
cgit v1.2.3