Merge branch 'erikd-ao-curses' into ao-curses
authorDavid Griffith <dave@661.org>
Sat, 11 Jun 2016 04:06:28 +0000 (21:06 -0700)
committerDavid Griffith <dave@661.org>
Sat, 11 Jun 2016 04:06:28 +0000 (21:06 -0700)

Trivial merge