From: nhmall <mjnh@persona.ca>
Date: Sun, 31 May 2015 02:23:25 +0000 (-0400)
Subject: Merge branch 'master' into status_hilite
X-Git-Tag: NetHack-3.6.0_RC01~323
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b4d9aab90a676cd405ae8a97b52a0d949ab2e7ae;p=nethack

Merge branch 'master' into status_hilite
---

b4d9aab90a676cd405ae8a97b52a0d949ab2e7ae