Merge branch 'master' into stable
authorIan Kelling <iank@fsf.org>
Thu, 14 Mar 2019 00:49:55 +0000 (20:49 -0400)
committerIan Kelling <iank@fsf.org>
Thu, 14 Mar 2019 00:49:55 +0000 (20:49 -0400)
commit142989c17558c710b918f2f81afccac681c99fc2
treead0fafc7be2c6fa5e0bf92ad467a4ae1e167eb1a
parent4e7d8fbd41a2d1e9c3ea0da5951884c80b5c1d6d
parent8f24bdabe14980600444e8a1c01f0f3c4abfd9dd
Merge branch 'master' into stable