summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-08-23 11:36:28 -0300
committerTomás Touceda <chiiph@leap.se>2013-08-23 11:36:28 -0300
commitc091267cb8191a8e23c352063113729cb7fb3cb1 (patch)
treeb0e8665cb3627ce3727fe047763ef87bf7675f68
parente85fbf156ba5ed3e24da6d92e8d021fe6fd9037d (diff)
Fold in changes0.3.1
-rw-r--r--CHANGELOG7
-rw-r--r--changes/bug_signal_events2
-rw-r--r--changes/feature_3487-split-soledad-into-common-client-and-server2
-rw-r--r--changes/feature_improve-packaging1
4 files changed, 7 insertions, 5 deletions
diff --git a/CHANGELOG b/CHANGELOG
index b7dc4a26..d2e45aa5 100644
--- 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
index 6149c561..00000000
--- 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
index 46983232..00000000
--- 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
index 5da993cd..00000000
--- a/changes/feature_improve-packaging
+++ /dev/null
@@ -1 +0,0 @@
- o Packaging improvements: add versioneer and parse_requirements