Merge branch 'master' into reorg

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2011-03-16 13:48:04 -04:00
commit 0f8edc99ee
2 changed files with 26 additions and 12 deletions

1
debian/changelog vendored
View file

@ -18,6 +18,7 @@ git-annex (0.20110316) UNRELEASED; urgency=low
content are made to have the same mtime as the original file.
While git does not preserve that information, this allows a tool
like metastore to be used with annexed files.
(Currently this is only done on systems supporting POSIX 200809.)
-- Joey Hess <joeyh@debian.org> Sun, 13 Mar 2011 14:25:17 -0400