merge from git-repair

This commit is contained in:
Joey Hess 2013-11-20 18:31:00 -04:00
parent a1f8621efc
commit 7dbb702edd
4 changed files with 136 additions and 71 deletions

6
debian/changelog vendored
View file

@ -1,3 +1,9 @@
git-annex (5.20131121) UNRELEASED; urgency=low
* Futher improvements to git repair.
-- Joey Hess <joeyh@debian.org> Wed, 20 Nov 2013 18:30:47 -0400
git-annex (5.20131120) unstable; urgency=low
* Fix Debian package to not try to run test suite, since haskell-tasty