simon-git: putty (master): Simon Tatham

[Commits to Tartarus CVS repository.]

TL;DR:
  d870b56 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:09:01

commit d870b5650e48eb04529e8f8d8e9f73ca9923b3a1
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=d870b5650e48eb04529e8f8d8e9f73ca9923b3a1;hp=a918c97dc9a383fc4afd24cce8eaa57d653d7c97
Merge: a918c97 f454235
Author: Simon Tatham <anakin at pobox.com>
Date:   Sat Nov 22 16:02:01 2014 +0000

    Merge branch 'pre-0.64'