Merge remote-tracking branch 'origin/master' into xmpp

Conflicts:
	doc/design/assistant/cloud.mdwn
This commit is contained in:
Joey Hess 2012-10-25 13:04:25 -04:00
commit 041c99c175
19 changed files with 331 additions and 51 deletions

1
debian/changelog vendored
View file

@ -21,6 +21,7 @@ git-annex (3.20121018) UNRELEASED; urgency=low
does not accept that.
* bugfix: Don't fail transferring content from read-only repos.
Closes: #691341
* configure: Check that checksum programs produce correct checksums.
-- Joey Hess <joeyh@debian.org> Wed, 17 Oct 2012 14:24:10 -0400