Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Wed, 22 Aug 2018 14:46:53 +0000 (10:46 -0400)
committerMolly de Blanc <molly@fsf.org>
Wed, 22 Aug 2018 14:46:53 +0000 (10:46 -0400)
commit6d9587285ae72ee7f124a49a5cedc4ecfdeb1f76
treeed0d6871c1c25465f938a96dab7a39d999cc466c
parent5e4865e0246b4123adefb6f9f5c0108a7121f79b
parent39db19c78a0141a00a6cf8de1e25db37bb00f02a
Merge branch 'master' into stable