Merge branch 'master' into live
authorAndrew Engelbrecht <andrew@fsf.org>
Fri, 19 Jan 2018 23:36:41 +0000 (18:36 -0500)
committerAndrew Engelbrecht <andrew@fsf.org>
Fri, 19 Jan 2018 23:36:41 +0000 (18:36 -0500)
commitf83c35d2ea542c7ba8c60be42b28d9012510171b
treec1bb4e3412c7f4705f681a2219c7954625425b73
parentc2fd1d7d4fc5a0627c808b90e66d80f7ed9a9197
parent3c6bd8154691293226173b4cbc38e52b2cf13af6
Merge branch 'master' into live