Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Wed, 1 Feb 2017 00:01:59 +0000 (20:01 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 1 Feb 2017 00:01:59 +0000 (20:01 -0400)

Trivial merge