Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Fri, 24 Aug 2018 15:22:15 +0000 (11:22 -0400)
committerMolly de Blanc <molly@fsf.org>
Fri, 24 Aug 2018 15:22:15 +0000 (11:22 -0400)
commitf733282248895a83a5be41de3599f1559f2f4fc4
tree8218328c24b0ec0fd519f633b6b73d7d450321e8
parent984fbfc729e665a004ea8308e3628bddc812ba1b
parentf7d2eb94b35238de55b3f64c5e719efd4f759b6d
Merge branch 'master' into stable