Merge branch 'master' into bs
authorJoey Hess <joeyh@joeyh.name>
Thu, 5 Dec 2019 15:41:30 +0000 (11:41 -0400)
committerJoey Hess <joeyh@joeyh.name>
Thu, 5 Dec 2019 15:41:30 +0000 (11:41 -0400)
commitc7a4411e7109d818954a5fa6ec33acf7135209b6
treed897ede5d8302d0be90bf57141e4bd0a044d719d
parent3c7fd09ec820bae90dcc783b2533a2915a9caf8c
parent4ad04618c61844ab0ee451a766aea4ff09dfcd8d
Merge branch 'master' into bs