Merge branch 'master' into database

Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2015-02-22 14:12:07 -04:00
commit fd2a543c7d
20 changed files with 484 additions and 41 deletions

View file

@ -1,5 +1,5 @@
Name: git-annex
Version: 5.20150205
Version: 5.20150219
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <id@joeyh.name>