[MERGE] Support for Putty SSH implementation, 2-nd edition

[Dmitry Vasiliev]

John Arbash Meinel wrote:
> My personal rule is to strip whitespace around the code that I'm
> editing, but not go out of my way to remove it. (So within a line or two
> of what I'm fixing).
> 
> That way, it is unlikely to have a spurious conflict, because if someone
> conflicts, they are likely to conflict anyway.
> 
> Eventually we probably want to watershed, remove all the trailing
> whitespace, and add tests to prevent adding new trailing whitespace. But
> we still have a lot of good work that hasn't been merged yet, and we
> want to keep people productive, rather than fighting with spurious
> whitespace conflicts.

Ok, I understand the point.

-- 
Dmitry Vasiliev <dima at hlabs.spb.ru>
http://hlabs.spb.ru