Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Tue, 16 Jan 2018 17:25:27 +0000 (12:25 -0500)
committerMolly de Blanc <molly@fsf.org>
Tue, 16 Jan 2018 17:25:27 +0000 (12:25 -0500)
commit9d7fb94141c41060fecd400c54ca9537a856c178
tree02ccc90b287e252e5e359febeb20168ab86c4978
parent542d3f03bc2fdb4186efe4f95978f9ed42e3ed0f
parent36e0114d093b8eed8260db41d2e11fa594752a3e
Merge branch 'master' into stable