Merge branch 'master' of ssh://git-annex.branchable.com
authorJoey Hess <joeyh@joeyh.name>
Mon, 12 Dec 2016 17:28:50 +0000 (13:28 -0400)
committerJoey Hess <joeyh@joeyh.name>
Mon, 12 Dec 2016 17:28:50 +0000 (13:28 -0400)

Trivial merge