Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 30 Dec 2016 14:48:56 +0000 (10:48 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 30 Dec 2016 14:48:56 +0000 (10:48 -0400)

Trivial merge