Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Mon, 13 Aug 2018 21:26:37 +0000 (17:26 -0400)
committerMolly de Blanc <molly@fsf.org>
Mon, 13 Aug 2018 21:26:37 +0000 (17:26 -0400)
commit581574f34f738c3dc414e52f19a90523c1ff7ef9
tree3a7c3f094b8c40ef42932d60df007cbae522fa10
parentb0b993ed7f780fa25e9e1b8ec6d52e093e690b77
parentedf4a8a246f34efda51ae0474c5030f4e2f3f5b7
Merge branch 'master' into stable