Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Sat, 31 Dec 2016 19:11:18 +0000 (15:11 -0400)
committerJoey Hess <joeyh@joeyh.name>
Sat, 31 Dec 2016 19:11:18 +0000 (15:11 -0400)

Trivial merge