simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  5904545 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-05 23:50:55

commit 5904545cc18289541702da284b00490cb25a753e
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=5904545cc18289541702da284b00490cb25a753e;hp=23208779e78024a004f5e51c189874cb50c29af0
Merge: 2320877 f3685eb
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Mon Jan 5 23:49:25 2015 +0000

    Merge branch 'pre-0.64'