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

Trivial merge