Merge branch 'NetHack-3.6.0' of https://rodney.nethack.org:20040/git/NHsource into...

Conflicts:
	doc/fixes36.1

diff --cc doc/fixes36.1
index b307e0b744fe59e042aac5a99c9cefaab3a059ad,22e70e2ec6a10b12e483422fb5397ba00ef55af9..9b47321e5589a7020304e887bc5eb30307ff8592
--- 1/doc/fixes36.1
--- 2/doc/fixes36.1
+++ b/doc/fixes36.1
@@@ -40,7 -40,8 +40,9 @@@ don't show the old level when you die g
          iron ball
  new high score with ", while helpless" attribute appended would erroneously
        result in ", while helpless" being appended to all scores
+ allow bright aliases for colors in menucolors
+ make MAXPLAYERS option in sysconf accept 0 value
 +avoid hearing yelps when you are deaf
  
  
  Platform- and/or Interface-Specific Fixes