simon-git: putty (master): Jacob Nevins

[Commits to Tartarus CVS repository.]

TL;DR:
  44a936f Merge shorter option name from '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-04 18:44:06

commit 44a936fbb526de7076830cc1093d17fdc05884b2
web diff http://tartarus.org/~simon-git/gitweb/?p=putty.git;a=commitdiff;h=44a936fbb526de7076830cc1093d17fdc05884b2;hp=7ef8505c780735518504cdac93fa8a9d8e60576f
Merge: 7ef8505 19da160
Author: Jacob Nevins <jacobn at chiark.greenend.org.uk>
Date:   Tue Nov 4 18:38:46 2014 +0000

    Merge shorter option name from 'pre-0.64'.