From: nhmall <mjnh@persona.ca>
Date: Fri, 29 May 2015 01:56:42 +0000 (-0400)
Subject: Merge branch 'master' of https://rodney.nethack.org:20040/git/NHsource
X-Git-Tag: NetHack-3.6.0_RC01~336
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bb9ea62dbe87f6c5802dbff47427c04234df87b;p=nethack

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

Conflicts:
	src/artifact.c
---

3bb9ea62dbe87f6c5802dbff47427c04234df87b