simon-git: putty (master): Owen Dunn

[Commits to Tartarus CVS repository.]

TL;DR:
  e22a72c Merge branch 'master' of ssh://tartarus.org/putty

Repository:     git://git.tartarus.org/simon/putty.git
On the web:     http://tartarus.org/~simon-git/gitweb/?p=putty.git
Branch updated: master
Committer:      Owen Dunn <owen at greenend.org.uk>
Date:           2016-04-03 15:10:36

commit e22a72c66a2d876f2ebe4bd6384b246af92cda4d
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=e22a72c66a2d876f2ebe4bd6384b246af92cda4d;hp=c2c22fb16a87783d26edd3235ea9b0d3c6f414e1
Merge: c2c22fb e31898d
Author: Owen Dunn <owen at greenend.org.uk>
Date:   Sun Apr 3 15:09:59 2016 +0100

    Merge branch 'master' of ssh://tartarus.org/putty