simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  f004bcc 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:           2015-02-27 09:28:18

commit f004bcca17a789356c32527a396b68b71a773db2
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=f004bcca17a789356c32527a396b68b71a773db2;hp=d89fdf65a79278eb83f335da5945e324c9b10943
Merge: d89fdf6 db9385b
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Fri Feb 27 09:28:05 2015 +0000

    Merge branch 'pre-0.64'