simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  d23c097 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:      Simon Tatham <anakin at pobox.com>
Date:           2014-11-22 16:43:22

commit d23c0972cd850c77871f9a314e0520d7023c8b62
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d23c0972cd850c77871f9a314e0520d7023c8b62;hp=c269dd0135a927d4d22a334cfefb09361f311fcd
Merge: c269dd0 8c09f85
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 22 16:42:01 2014 +0000

    Merge branch 'pre-0.64'