Merge branch 'master' into bootstrap3

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2014-05-02 15:32:49 -03:00
commit 2aed2d8510
129 changed files with 2173 additions and 80 deletions

4
debian/changelog vendored
View file

@ -2,6 +2,10 @@ git-annex (5.20140422) UNRELEASED; urgency=medium
* webapp: Switched to bootstrap 3.
Thanks, Sören Brunk.
* Standalone builds now check gpg signatures before upgrading.
* Simplified repository description line format. The remote name,
if any, is always in square brackets after the description.
* assistant: Clean up stale tmp files on startup.
-- Joey Hess <joeyh@debian.org> Fri, 02 May 2014 15:28:53 -0300