summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-09 14:26:02 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-09 14:26:02 -0300
commit94c6176eb5ed14a8037500e1da29a775bc0d15a9 (patch)
tree5740b20ad8caf341f57062f136e81dca2760b63b
parent9a6132066df109f5c90cc6ca3316b973fa26b747 (diff)
Fold in changes
-rw-r--r--CHANGELOG7
-rw-r--r--changes/bug_dont_fail_if_nickserver_does1
-rw-r--r--changes/bug_supported_options2
-rw-r--r--changes/feature_3397-keymanager-should-support-bundled-gpg2
4 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 174318d8..b7dc4a26 100644
--- 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
index 6e44d931..00000000
--- 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
index e7a70d38..00000000
--- 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
index 6774dd8a..00000000
--- 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.