summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-10-04 11:22:53 -0300
committerTomás Touceda <chiiph@leap.se>2013-10-04 11:22:53 -0300
commitdad5faffd96699e7a883299b9ea098e6694ca5ea (patch)
tree8ce8deb3a7186bbb74fdea1a1e3c3b8677edc9e4
parenteb21ca7e44c1859a8a10aebf5bb056f42981d1ac (diff)
Fold in changes
-rw-r--r--CHANGELOG4
-rw-r--r--changes/bug_enforce_correct_version1
-rw-r--r--changes/feature_2342-use-new-gnupg-module1
3 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 9cd53b3b..6ec2624f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+0.3.3 Oct 4:
+ o Add a sanity check for the correct version of gnupg.
+ o Update code to use gnupg 1.2.2 python module. Closes #2342.
+
0.3.2 Sep 6:
o Do not raise exception when a GET request doesn't return 2XX
code. Nickserver uses error codes for more verbosity in the
diff --git a/changes/bug_enforce_correct_version b/changes/bug_enforce_correct_version
deleted file mode 100644
index eb03e418..00000000
--- a/changes/bug_enforce_correct_version
+++ /dev/null
@@ -1 +0,0 @@
- o Add a sanity check for the correct version of gnupg.
diff --git a/changes/feature_2342-use-new-gnupg-module b/changes/feature_2342-use-new-gnupg-module
deleted file mode 100644
index b83e8ec3..00000000
--- a/changes/feature_2342-use-new-gnupg-module
+++ /dev/null
@@ -1 +0,0 @@
- o Update code to use gnupg 1.2.2 python module. Closes #2342.