From: Simon Tatham <anakin@pobox.com>
Date: Sat, 7 Nov 2015 09:14:42 +0000 (+0000)
Subject: Initial 'merge -s ours' from 0.66 release branch.
X-Git-Tag: 0.68~336
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=009ab4a20cfd685ff20b8f922068ffa6900b92c7;p=PuTTY.git

Initial 'merge -s ours' from 0.66 release branch.

Everything up to here on the release branch is cherry-picks from
master anyway, and some of their cherry-picked forms conflict with the
current state of master due to further work, so here I'm just
recording an ancestry relation to indicate that there's nothing up to
here on 0.66 that master hasn't got.
---

009ab4a20cfd685ff20b8f922068ffa6900b92c7