Fold in changes

diff --git a/CHANGELOG b/CHANGELOG
index 174318d..b7dc4a2 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,2 +1,9 @@
+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
+    removing it for the time being.
+  o Add support for bundled gpg. Closes #3397.
+  o Refactor API to include encrypt/decrypt/sign/verify in KeyManager.
+
 0.2.0 Jul 12:
   o Move keymanager to its own package

diff --git a/changes/bug_dont_fail_if_nickserver_does b/changes/bug_dont_fail_if_nickserver_does
deleted file mode 100644 (file)
index 6e44d93..0000000
--- a/changes/bug_dont_fail_if_nickserver_does
+++ /dev/null
@@ -1 +0,0 @@
-  o If a nickserver request fails in any way, notify and continue.
\ No newline at end of file

diff --git a/changes/bug_supported_options b/changes/bug_supported_options
deleted file mode 100644 (file)
index e7a70d3..0000000
--- a/changes/bug_supported_options
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Options parameter in gnupg.GPG isn't supported by all versions, so
-    removing it for the time being.
\ No newline at end of file

diff --git a/changes/feature_3397-keymanager-should-support-bundled-gpg b/changes/feature_3397-keymanager-should-support-bundled-gpg
deleted file mode 100644 (file)
index 6774dd8..0000000
--- a/changes/feature_3397-keymanager-should-support-bundled-gpg
+++ /dev/null
@@ -1,2 +0,0 @@
-  o Add support for bundled gpg. Closes #3397.
-  o Refactor API to include encrypt/decrypt/sign/verify in KeyManager.