Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Fri, 10 Feb 2017 17:51:53 +0000 (13:51 -0400)
committerJoey Hess <joeyh@joeyh.name>
Fri, 10 Feb 2017 17:51:53 +0000 (13:51 -0400)

Trivial merge