Merge branch 'master' into win32-x64-working

Conflicts:
	include/extern.h

diff --cc include/extern.h
index b0dded626adea11a36bb212f590919cef16c24e2,b3cee67087973e8ab37009f0b5a87f3c8dad8c91..bcf9aaa344cc4948a15971750d55103f2e6cb8ba
--- 1/include/extern.h
--- 2/include/extern.h
+++ b/include/extern.h
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        extern.h        $NHDT-Date: 1428715841 2015/04/11 01:30:41 $  $NHDT-Branch: master $:$NHDT-Revision: 1.454 $ */
+ /* NetHack 3.5        extern.h        $NHDT-Date: 1428806395 2015/04/12 02:39:55 $  $NHDT-Branch: master $:$NHDT-Revision: 1.455 $ */
 -/* NetHack 3.5        extern.h        $Date: 2013/11/05 00:57:53 $  $Revision: 1.380 $ */
  /* Copyright (c) Steve Creps, 1988.                             */
  /* NetHack may be freely redistributed.  See license for details. */