Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Wed, 27 Jun 2018 19:18:42 +0000 (15:18 -0400)
committerMolly de Blanc <molly@fsf.org>
Wed, 27 Jun 2018 19:18:42 +0000 (15:18 -0400)
commit18e39eeeee03cd1737c5d528d62f7495648ba6ac
tree7f2ffb488222c183d8fde707ae8421a3fd918910
parent1bea123985f6f656b5f003be3398903dd56b2d1c
parent0bf4cafc957c2b8c32233952dc5b1489b749db6f
Merge branch 'master' into stable