Fold in changes

5 files changed, 7 insertions, 5 deletions

diff --git a/CHANGELOG b/CHANGELOG
index e20b86c8..a081cc50 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+0.3.7 Dec 6:
+  o Fix error return values on openpgp backend.
+  o Remove address check when sending email and rely in the email
+    client to verify that is correct. Closes #4491.
+  o Support sending encrypted mails to addresses using the '+' sign.
+  o Improve exception names and handling.
+
 0.3.6 Nov 15:
   o Default encoding to 'utf-8' in case of system encodings not
     set. Closes #4427.
diff --git a/changes/VERSION_COMPAT b/changes/VERSION_COMPAT
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/changes/VERSION_COMPAT
diff --git a/changes/bug_fix-returns b/changes/bug_fix-returns
deleted file mode 100644
index 3bb72646..00000000
--- a/changes/bug_fix-returns
+++ /dev/null
@@ -1 +0,0 @@
-  o Fix error return values on openpgp backend.
diff --git a/changes/email-checks b/changes/email-checks
deleted file mode 100644
index eee7de75..00000000
--- a/changes/email-checks
+++ /dev/null
@@ -1,3 +0,0 @@
-  o Remove address check when sending email and rely in the email client to
-    verify that is correct. Closes #4491.
-  o Support sending encrypted mails to addresses using the '+' sign.
diff --git a/changes/feature_improve-exceptions-names-and-handling b/changes/feature_improve-exceptions-names-and-handling
deleted file mode 100644
index 936232d6..00000000
--- a/changes/feature_improve-exceptions-names-and-handling
+++ /dev/null
@@ -1 +0,0 @@
-  o Improve exception names and handling.