Merge branch 'master' into s3-aws

This commit is contained in:
Joey Hess 2014-10-28 12:39:22 -04:00
commit e535ff8fa4
27 changed files with 205 additions and 67 deletions

View file

@ -1,5 +1,5 @@
Name: git-annex
Version: 5.20141013
Version: 5.20141024
Cabal-Version: >= 1.8
License: GPL-3
Maintainer: Joey Hess <joey@kitenet.net>