Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 9 Dec 2015 22:14:19 +0000 (18:14 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 9 Dec 2015 22:14:19 +0000 (18:14 -0400)

Trivial merge