simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  d89fdf6 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-24 10:38:22

commit d89fdf65a79278eb83f335da5945e324c9b10943
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d89fdf65a79278eb83f335da5945e324c9b10943;hp=a87a14ae0fc7d4621b5b1fafdb2053b3638b4b2b
Merge: a87a14a 56a42d0
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Tue Feb 24 10:37:53 2015 +0000

    Merge branch 'pre-0.64'