Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Thu, 23 Aug 2018 15:03:58 +0000 (11:03 -0400)
committerMolly de Blanc <molly@fsf.org>
Thu, 23 Aug 2018 15:03:58 +0000 (11:03 -0400)
commit984fbfc729e665a004ea8308e3628bddc812ba1b
treeb04cfef3b92c82b47cb9d2d7014c56098e33ef71
parent6d9587285ae72ee7f124a49a5cedc4ecfdeb1f76
parenta7a95a24f0965d50fab2406cef7714970669a4b9
Merge branch 'master' into stable