Merge branch 'master' into watch

This commit is contained in:
Joey Hess 2012-06-20 13:15:59 -04:00
commit 483b1b08c6
24 changed files with 225 additions and 48 deletions

1
debian/changelog vendored
View file

@ -5,6 +5,7 @@ git-annex (3.20120616) UNRELEASED; urgency=low
need to manually run git commands when manipulating files.
Available on Linux, BSDs, and OSX!
* Enable diskfree on kfreebsd, using statvfs.
* unused: Fix crash when key names contain invalid utf8.
-- Joey Hess <joeyh@debian.org> Tue, 12 Jun 2012 11:35:59 -0400