Merge branch 'pre-0.64'

diff --cc LICENCE
Simple merge

diff --cc doc/licence.but
Simple merge

diff --cc unix/gtkdlg.c
Simple merge

diff --cc unix/uxplink.c
Simple merge

diff --cc windows/pageant.rc
index d354a9c751603a14c3ff2480473f4b6dcf2e34e7,20ec509b12ceff7b94c1fa3f0d4c874935acaf65..dee8a12e28cafd52c3a35a2885fc8f76461a9788
--- 1/windows/pageant.rc
--- 2/windows/pageant.rc
+++ b/windows/pageant.rc
@@@ -55,9 -55,9 +55,9 @@@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAP
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
  
-     LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+     LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 206, 8
  
      LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
      LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8

diff --cc windows/puttygen.rc
index 63c0bcc076d9b3b4cc67165113c834864c9a7073,9547e754732a559d0058eafdbf5c6ef2977411eb..8982674a9ab3a506e331ac895312abe266dc82d5
--- 1/windows/puttygen.rc
--- 2/windows/puttygen.rc
+++ b/windows/puttygen.rc
@@@ -48,9 -48,9 +48,9 @@@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAP
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
  
-     LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+     LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 206, 8
  
      LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
      LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8

diff --cc windows/win_res.rc2
index d0273350a4604ff43489091cded39bbcd6b6c02c,b7dfd945d438aa88cd40a559490774d7771b243c..744780ba67d8a14723e7a82bee3e7e04211dcf84
--- 1/windows/win_res.rc2
--- 2/windows/win_res.rc2
+++ b/windows/win_res.rc2
@@@ -56,9 -56,9 +56,9 @@@ STYLE DS_MODALFRAME | WS_POPUP | WS_CAP
  CAPTION "PuTTY Licence"
  FONT 8, "MS Shell Dlg"
  BEGIN
 -    DEFPUSHBUTTON "OK", IDOK, 98, 243, 44, 14
 +    DEFPUSHBUTTON "OK", IDOK, 98, 251, 44, 14
  
-     LTEXT "Copyright \251 1997-2014 Simon Tatham", 1000, 10, 10, 206, 8
+     LTEXT "Copyright \251 1997-2015 Simon Tatham", 1000, 10, 10, 206, 8
  
      LTEXT "Portions copyright Robert de Bath, Joris van Rantwijk, Delian", 1001, 10, 26, 206, 8
      LTEXT "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas", 1002, 10, 34, 206, 8