Merge branch 'master' into win32-x64-working

Conflicts:
	src/restore.c
	src/save.c

diff --cc src/restore.c
index 5ff3358a52ef69be2ba9822f731154e2befca49a,c7fc31c073251dfb9e55badd38d7cf5aace5af6b..ed11b28ed5aec9258a12e25d2786d54c8c47c916
--- 1/src/restore.c
--- 2/src/restore.c
+++ b/src/restore.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        restore.c       $NHDT-Date: 1426465439 2015/03/16 00:23:59 $  $NHDT-Branch: debug $:$NHDT-Revision: 1.77 $ */
+ /* NetHack 3.5        restore.c       $NHDT-Date: 1429757270 2015/04/23 02:47:50 $  $NHDT-Branch: master $:$NHDT-Revision: 1.93 $ */
 -/* NetHack 3.5        restore.c       $Date: 2012/02/16 02:40:24 $  $Revision: 1.71 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */
  

diff --cc src/save.c
index da4e3b09ff9f7c681358b193b1a6931952e4b74e,7069a8eca487cc13cf3c957c33e4bb91c50282a1..527adfbecdcc6dd4bc9326ef75212a95c0e2bf41
--- 1/src/save.c
--- 2/src/save.c
+++ b/src/save.c
@@@ -1,4 -1,5 +1,4 @@@
- /* NetHack 3.5        save.c  $NHDT-Date: 1426496455 2015/03/16 09:00:55 $  $NHDT-Branch: master $:$NHDT-Revision: 1.62 $ */
+ /* NetHack 3.5        save.c  $NHDT-Date: 1429757271 2015/04/23 02:47:51 $  $NHDT-Branch: master $:$NHDT-Revision: 1.82 $ */
 -/* NetHack 3.5        save.c  $Date: 2012/02/16 02:40:24 $  $Revision: 1.53 $ */
  /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
  /* NetHack may be freely redistributed.  See license for details. */