Merge branch 'master' into stable
authorIan Kelling <iank@fsf.org>
Tue, 19 Mar 2019 16:05:28 +0000 (12:05 -0400)
committerIan Kelling <iank@fsf.org>
Tue, 19 Mar 2019 16:05:28 +0000 (12:05 -0400)
commit4d8db5027a34efa80ca2889f119ca846dbe634c8
tree0013f4ba965d7bcff0fafa6cbb645bc9cb3aace0
parent2cf8d6fc1e2c7b2d2d513a18a2ceb620b0a35668
parent9fdc7cc16c731e4a631d654bda7f85ea0d73d58b
Merge branch 'master' into stable