From 122b09e2f24cff55c65b84cbccd78ed640a234be Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Sat, 24 Dec 2016 14:53:58 -0400
Subject: Merge from git-annex.

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'CHANGELOG')

diff --git a/CHANGELOG b/CHANGELOG
index d6cc186..1a17a93 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+git-repair (1.20161119) UNRELEASED; urgency=medium
+
+  * Merge from git-annex.
+
+ -- Joey Hess <id@joeyh.name>  Sat, 24 Dec 2016 14:53:47 -0400
+
 git-repair (1.20161118) unstable; urgency=medium
 
   * Fix build with recent versions of cabal and ghc.
-- 
cgit v1.2.3