Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Fri, 17 Aug 2018 14:43:29 +0000 (10:43 -0400)
committerMolly de Blanc <molly@fsf.org>
Fri, 17 Aug 2018 14:43:29 +0000 (10:43 -0400)
commit5e4865e0246b4123adefb6f9f5c0108a7121f79b
treeff3df10d7127534837e81f7f7df2bea8e3c05043
parent4ec3743044e352af1abafbc05c343433e7461552
parent00e1b03755b64c748805389f5412d04efbd9f1d9
Merge branch 'master' into stable