Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Tue, 9 Jan 2018 19:18:17 +0000 (14:18 -0500)
committerMolly de Blanc <molly@fsf.org>
Tue, 9 Jan 2018 19:18:17 +0000 (14:18 -0500)
commit2ead6d37b434a8d1e9523f970e5ce0952fd1c461
tree69ea939311abf30b15a7c5b6ce463418ebe80e04
parent16f8a6102a8a83d6a5593e95e7e6c604aafd806b
parent4bf1f6630bb7a736bb663ba0a809a4bdc3683093
Merge branch 'master' into stable