From 9f03a34d25b3f6d89fcc5ca1039bee49b6493763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1s=20Touceda?= <chiiph@leap.se>
Date: Fri, 1 Nov 2013 10:33:51 -0300
Subject: Fold in changes

---
 CHANGELOG                         | 4 ++++
 changes/bug-4000_suport-non-ascii | 1 -
 2 files changed, 4 insertions(+), 1 deletion(-)
 delete mode 100644 changes/bug-4000_suport-non-ascii

diff --git a/CHANGELOG b/CHANGELOG
index 8371498..dc89742 100644
--- a/CHANGELOG
+++ b/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/changes/bug-4000_suport-non-ascii b/changes/bug-4000_suport-non-ascii
deleted file mode 100644
index cb1b78f..0000000
--- a/changes/bug-4000_suport-non-ascii
+++ /dev/null
@@ -1 +0,0 @@
-  o Return unicode decrypted text to avoid encoding issues. Related to #4000.
-- 
cgit v1.2.3