Merge branch 'master' into stable
authorMolly de Blanc <molly@fsf.org>
Wed, 15 Aug 2018 20:22:51 +0000 (16:22 -0400)
committerMolly de Blanc <molly@fsf.org>
Wed, 15 Aug 2018 20:22:51 +0000 (16:22 -0400)
commit4ec3743044e352af1abafbc05c343433e7461552
tree3ae522400fbf5d10cc0e322e9dfb6a1022a45d2b
parent315c005319f4fca5956778199ba0a7f807a9fd0d
parent4e923f2ea8f2ad4a1bcd572594562dfe2ef0e98e
Merge branch 'master' into stable