From: nhmall <mjnh@persona.ca>
Date: Mon, 6 Apr 2015 21:47:11 +0000 (-0400)
Subject: Merge branch 'master' into nhmall-booktribute
X-Git-Tag: NetHack-3.6.0_RC01~480^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06227ec0d3e7de2a35b9fe594fdcda049d522ca8;p=nethack

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

06227ec0d3e7de2a35b9fe594fdcda049d522ca8