Fix for bug in nor()
Merge branch 'master' into ambrosia
Remove the 9999 ceiling on mail.c/mailfix.c
Merge http://github.com/RhostMUSH/trunk into ashen-shugar
Fixes
Merge branch 'ashen-shugar' into ambrosia