Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 30 Jan 2017 21:34:48 +0000 (17:34 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 30 Jan 2017 21:34:48 +0000 (17:34 -0400)

Trivial merge