summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorKali Kaneko <kali@leap.se>2013-11-07 20:11:39 -0200
committerKali Kaneko <kali@leap.se>2013-11-08 11:32:00 -0200
commit1ab2dc49981fe79faa7a21d7d17dd6bcc012251a (patch)
tree0902fcf378bfb9ffde2406b92272ca4e3b1b50a9 /debian
parent6c5ac99096c9eba9197a4813ce5b310b5ea3c482 (diff)
changelog entry for the two cherry-picks
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog10
1 files changed, 10 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index c5d25fd9..62d49a6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+soledad (0.4.2.2) unstable; urgency=low
+
+ * soledad-client: Cherry-pick change for autocommit mode, which fixes
+ a "cannot start a transaction within a transaction" that was
+ rendering the client unusable.
+ * soledad-client: Cherry-pick for default encoding, which fixes a bug
+ that was rendering the client unusable.
+
+ -- Ben Carrillo <ben@futeisha.org> Thu, 07 Nov 2013 20:09:29 -0200
+
soledad (0.4.2.1) unstable; urgency=low
* Change cchardet dependency for chardet explicitly.