From: Derek <derekray@gmail.com>
Date: Fri, 13 Feb 2015 18:29:23 +0000 (-0500)
Subject: Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource
X-Git-Tag: NetHack-3.6.0_RC01~691^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f5089838c16f48f7262042038b35857c60304ca2;p=nethack

Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource
---

f5089838c16f48f7262042038b35857c60304ca2