From: nhmall <mjnh@persona.ca>
Date: Sat, 30 May 2015 14:59:39 +0000 (-0400)
Subject: Merge branch 'master' into status_hilite
X-Git-Tag: NetHack-3.6.0_RC01~325
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=54cee6913ecf595f69172348db3bbd6607c400ae;p=nethack

Merge branch 'master' into status_hilite
---

54cee6913ecf595f69172348db3bbd6607c400ae