Merge branch 'quetzal' of https://github.com/escondida/frotz into escondida-quetzal
authorDavid Griffith <dave@661.org>
Tue, 20 Feb 2018 11:10:53 +0000 (03:10 -0800)
committerDavid Griffith <dave@661.org>
Tue, 20 Feb 2018 11:10:53 +0000 (03:10 -0800)

Trivial merge