Merge branch 'master' into fsf-master
authorAndrew Engelbrecht <andrew@fsf.org>
Mon, 13 Jan 2020 20:20:23 +0000 (15:20 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Mon, 13 Jan 2020 20:20:23 +0000 (15:20 -0500)
commit6a8f3de1e10356c9059ae8bafe13f7390e75a22b
treee9f94df83a46b6435ec5c70f404eb447bbc8192c
parent0df5ff3f379c6cc8e5f8de04889c42c1b2dfd9b0
parent1b3dd3a41b544592be46b39db563bb757f88bbad
Merge branch 'master' into fsf-master