summaryrefslogtreecommitdiff
path: root/debian/changelog
diff options
context:
space:
mode:
Diffstat (limited to 'debian/changelog')
-rw-r--r--debian/changelog2
1 files changed, 2 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 65e091753..b3e825560 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ git-annex (3.20121010) UNRELEASED; urgency=low
their group, or even to disable syncing to them.
* git config remote.name.annex-sync can be used to control whether
a remote gets synced.
+ * Fix a crash when merging files in the git-annex branch that contain
+ invalid utf8.
-- Joey Hess <joeyh@debian.org> Wed, 10 Oct 2012 12:59:25 -0400