simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  286cd5a Merge branch 'pre-0.64'.

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:           2014-11-09 12:44:02

commit 286cd5a1d8685a44625cd6423c1a8eb93cfa4223
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=286cd5a1d8685a44625cd6423c1a8eb93cfa4223;hp=0ab2e03ef2dba047c5e2bd5faf346b42b445fb70
Merge: 0ab2e03 5429eff
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Sun Nov 9 12:41:10 2014 +0000

    Merge branch 'pre-0.64'.