simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  954df09 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-01-08 23:51:28

commit 954df095f4ec3ca98c225e89f737f17477695785
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=954df095f4ec3ca98c225e89f737f17477695785;hp=5904545cc18289541702da284b00490cb25a753e
Merge: 5904545 3a9ce50
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Thu Jan 8 23:50:34 2015 +0000

    Merge branch 'pre-0.64'