Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Thu, 12 Nov 2015 22:24:56 +0000 (18:24 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 12 Nov 2015 22:24:56 +0000 (18:24 -0400)

Trivial merge