From: nhmall <mjnh@persona.ca>
Date: Sat, 4 Apr 2015 12:31:14 +0000 (-0400)
Subject: Merge branch 'master' into nhmall-booktribute
X-Git-Tag: NetHack-3.6.0_RC01~480^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5432ba7f441a5800f350e9d34102c78f8dc27d97;p=nethack

Merge branch 'master' into nhmall-booktribute
---

5432ba7f441a5800f350e9d34102c78f8dc27d97