Merge branch 'master' of https://github.com/welash/frotz into welash-master
authorDavid Griffith <dave@661.org>
Fri, 15 May 2015 04:02:47 +0000 (21:02 -0700)
committerDavid Griffith <dave@661.org>
Fri, 15 May 2015 04:02:47 +0000 (21:02 -0700)

Trivial merge