simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  0ab2e03 Merge reconfig fixes from 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:           2014-11-09 00:15:28

commit 0ab2e03ef2dba047c5e2bd5faf346b42b445fb70
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=0ab2e03ef2dba047c5e2bd5faf346b42b445fb70;hp=8ab1433caaefef02a19e8e5ea74e5259fa719eae
Merge: 8ab1433 f662ff7
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Sun Nov 9 00:12:51 2014 +0000

    Merge reconfig fixes from branch 'pre-0.64'.