simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  ced3a46 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-18 14:50:35

commit ced3a46c3f993e6257ec25337395d0c6bf6dbf59
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=ced3a46c3f993e6257ec25337395d0c6bf6dbf59;hp=954df095f4ec3ca98c225e89f737f17477695785
Merge: 954df09 8dedf59
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Sun Jan 18 14:50:20 2015 +0000

    Merge branch 'pre-0.64'