Fold in changes

diff --git a/CHANGELOG b/CHANGELOG
index 81c5f96..4b1fc70 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,14 @@
+0.3.1 Aug 23:
+  o Add libssl-dev requirement for pyOpenSSL.
+  o Make the server ping call be async inside events'
+    ensure_server. Fixes #3355.
+  o Requirements in setup are taken from requirements.pip
+  o Updated requirements.
+  o Add IMAP_UNREAD_MAIL event.
+  o Add events for SMTP relay signaling. Closes #3464.
+  o Add events for imap and keymanager notifications. Closes: #3480
+  o Add versioneer to handle versioning.
+
 0.3.0 Aug 9:
   o OSX: Fix problem with path prefix not returning the correct
     value. Fixes #3273.

diff --git a/changes/bug-update-readme-requirements b/changes/bug-update-readme-requirements
deleted file mode 100644 (file)
index 079a098..0000000
--- a/changes/bug-update-readme-requirements
+++ /dev/null
@@ -1 +0,0 @@
-  o Add libssl-dev requirement for pyOpenSSL.

diff --git a/changes/bug_make_ping_async b/changes/bug_make_ping_async
deleted file mode 100644 (file)
index 692518c..0000000
--- a/changes/bug_make_ping_async
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Make the server ping call be async inside events'
-    ensure_server. Fixes #3355.
\ No newline at end of file

diff --git a/changes/bug_update-deps b/changes/bug_update-deps
deleted file mode 100644 (file)
index e34ff59..0000000
--- a/changes/bug_update-deps
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Requirements in setup are taken fro requirements.pip
-  o Updated requirements.

diff --git a/changes/feat_unread_email b/changes/feat_unread_email
deleted file mode 100644 (file)
index b7ad98e..0000000
--- a/changes/feat_unread_email
+++ /dev/null
@@ -1 +0,0 @@
-  o Add IMAP_UNREAD_MAIL event.
\ No newline at end of file

diff --git a/changes/feature_3464-make-smtprelay-emit-signals b/changes/feature_3464-make-smtprelay-emit-signals
deleted file mode 100644 (file)
index 0b7753f..0000000
--- a/changes/feature_3464-make-smtprelay-emit-signals
+++ /dev/null
@@ -1 +0,0 @@
-  o Add events for SMTP relay signaling. Closes #3464.

diff --git a/changes/feature_add_imap_keymanager_events b/changes/feature_add_imap_keymanager_events
deleted file mode 100644 (file)
index 5bf1d0f..0000000
--- a/changes/feature_add_imap_keymanager_events
+++ /dev/null
@@ -1 +0,0 @@
-  o Add events for imap and keymanager notifications. Closes: #3480

diff --git a/changes/feature_add_versioneer b/changes/feature_add_versioneer
deleted file mode 100644 (file)
index 19b4a82..0000000
--- a/changes/feature_add_versioneer
+++ /dev/null
@@ -1 +0,0 @@
-  o Add versioneer to handle versioning.