Fold in changes

diff --git a/CHANGELOG b/CHANGELOG
index b7dc4a2..d2e45aa 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,10 @@
+0.3.1 Aug 23:
+  o Signal different key related events, like key generation, key
+    upload.
+  o Update to new soledad package scheme (common, client and
+    server). Closes #3487.
+  o Packaging improvements: add versioneer and parse_requirements.
+
 0.3.0 Aug 9:
   o If a nickserver request fails in any way, notify and continue.
   o Options parameter in gnupg.GPG isn't supported by all versions, so

diff --git a/changes/bug_signal_events b/changes/bug_signal_events
deleted file mode 100644 (file)
index 6149c56..0000000
--- a/changes/bug_signal_events
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Signal different key related events, like key generation, key
-    upload.
\ No newline at end of file

diff --git a/changes/feature_3487-split-soledad-into-common-client-and-server b/changes/feature_3487-split-soledad-into-common-client-and-server
deleted file mode 100644 (file)
index 4698323..0000000
--- a/changes/feature_3487-split-soledad-into-common-client-and-server
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Update to new soledad package scheme (common, client and server). Closes
-    #3487.

diff --git a/changes/feature_improve-packaging b/changes/feature_improve-packaging
deleted file mode 100644 (file)
index 5da993c..0000000
--- a/changes/feature_improve-packaging
+++ /dev/null
@@ -1 +0,0 @@
-  o Packaging improvements: add versioneer and parse_requirements