Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Tue, 16 Jan 2018 18:49:03 +0000 (13:49 -0500)
committerMolly de Blanc <molly@fsf.org>
Tue, 16 Jan 2018 18:49:03 +0000 (13:49 -0500)
commit3973a1841cbf567ad53b459e7b68019078ff1411
tree3dd5b01c0d060307b00ee322194ab3a12256181e
parent9d7fb94141c41060fecd400c54ca9537a856c178
parentd7a61cdf4ca28cf74d4bb593b84b545630ee59c9
Merge branch 'master' into stable