summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-11-01 10:33:51 -0300
committerTomás Touceda <chiiph@leap.se>2013-11-01 10:33:51 -0300
commit4f066dfd45e03c9fab4c72205a217959f9ab8ca5 (patch)
tree043ae17d1a29cde4ae133601631d18fa86c7abbc
parent0137886fb84268e188ecd0b324cbe8b238eb4757 (diff)
Fold in changes
-rw-r--r--keymanager/CHANGELOG4
-rw-r--r--keymanager/changes/bug-4000_suport-non-ascii1
2 files changed, 4 insertions, 1 deletions
diff --git a/keymanager/CHANGELOG b/keymanager/CHANGELOG
index 83714984..dc89742c 100644
--- a/keymanager/CHANGELOG
+++ b/keymanager/CHANGELOG
@@ -1,3 +1,7 @@
+0.3.5 Nov 1:
+ o Return unicode decrypted text to avoid encoding issues. Related to
+ #4000.
+
0.3.4 Oct 18:
o Add option to choose cipher and digest algorithms when signing and
encrypting. Closes #4030.
diff --git a/keymanager/changes/bug-4000_suport-non-ascii b/keymanager/changes/bug-4000_suport-non-ascii
deleted file mode 100644
index cb1b78f1..00000000
--- a/keymanager/changes/bug-4000_suport-non-ascii
+++ /dev/null
@@ -1 +0,0 @@
- o Return unicode decrypted text to avoid encoding issues. Related to #4000.