Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Tue, 9 Jan 2018 19:14:34 +0000 (14:14 -0500)
committerMolly de Blanc <molly@fsf.org>
Tue, 9 Jan 2018 19:14:34 +0000 (14:14 -0500)
commit16f8a6102a8a83d6a5593e95e7e6c604aafd806b
tree441fb5c93362904d3804b7a36ac5d659975dd40c
parent4ada337e86481e4e56820021910a8504df549692
parent69276b05a6efe4058ee7b0887d7babebeec83b92
Merge branch 'master' into stable