Merge branch 'master' into stable
authorIan Kelling <iank@fsf.org>
Tue, 19 Mar 2019 16:06:14 +0000 (12:06 -0400)
committerIan Kelling <iank@fsf.org>
Tue, 19 Mar 2019 16:06:14 +0000 (12:06 -0400)
commit956c6fbd5cce457aa4921b0815d59d354eeb7a1a
treeb71cdeb463429defa7f17ccb774918d274e1ee4e
parent4d8db5027a34efa80ca2889f119ca846dbe634c8
parenteddb43d262507717b4267d0eb8ab2db8bf467e3e
Merge branch 'master' into stable