Merge branch 'master' into stable
authorDana Morgenstein <danam@freestation11.office.fsf.org>
Mon, 17 Dec 2018 20:35:58 +0000 (15:35 -0500)
committerDana Morgenstein <danam@freestation11.office.fsf.org>
Mon, 17 Dec 2018 20:35:58 +0000 (15:35 -0500)
commitfb329eab57cf713bb8aefcc5072c623540ee1aa5
treef9f6fb98d20c4eacb93e36e79e549a04b0338111
parentb3642867811c959933b85a91232b943d8901b3c8
parent5c55d02bc49dad74c2ffedb5e96384c1ea25d601
Merge branch 'master' into stable