simon-git: putty (master): Ben Harris

[Commits to Tartarus CVS repository.]

TL;DR:
  9e20c81 Merge branch 'pre-0.65'

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Ben Harris <bjh21 at bjh21.me.uk>
Date:           2015-06-25 23:45:39

commit 9e20c81bc9c945565dd182854eeffa03b63f830a
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=9e20c81bc9c945565dd182854eeffa03b63f830a;hp=307aaccc59f6fbfdf7b980ae709c083786044163
Merge: 307aacc 95501a1
Author: Ben Harris <bjh21 at bjh21.me.uk>
Date:   Thu Jun 25 23:38:41 2015 +0100

    Merge branch 'pre-0.65'