Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Wed, 15 Aug 2018 18:14:48 +0000 (14:14 -0400)
committerMolly de Blanc <molly@fsf.org>
Wed, 15 Aug 2018 18:14:48 +0000 (14:14 -0400)
commit315c005319f4fca5956778199ba0a7f807a9fd0d
tree06adf54c86f16a224f0be0be125dc2d1ca971b62
parent581574f34f738c3dc414e52f19a90523c1ff7ef9
parente8081e54f6a4b7d8594222aec1751ec51490a05c
Merge branch 'master' into stable