summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2014-11-03 16:05:03 -0400
committerGravatar Joey Hess <joey@kitenet.net>2014-11-03 16:05:03 -0400
commit1780931b0443302ddbe177ffb3037da88e1c2704 (patch)
tree20a9f34d030c65802a6113ab2c6b5ed6162015e6 /debian
parentb69362e972190668a0742059f0798d2ce00f15c6 (diff)
parentfe5f014c409a044218b469f99149e69efa6d2a2e (diff)
Merge branch 'master' into s3-aws-multipart
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog6
1 files changed, 6 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 8af44b3bb..efaba2d95 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+git-annex (5.20141025) UNRELEASED; urgency=medium
+
+ * Windows: Fix crash when user.name is not set in git config.
+
+ -- Joey Hess <joeyh@debian.org> Fri, 31 Oct 2014 16:13:43 -0400
+
git-annex (5.20141024) unstable; urgency=medium
* vicfg: Deleting configurations now resets to the default, where