Merge branch 'doc-putty'
commit52cf3938b300ab68c3d6b271f06a0294d89f2a10
authorSven Strickroth <email@cs-ware.de>
Sun, 15 Jan 2012 15:04:45 +0000 (15 16:04 +0100)
committerSven Strickroth <email@cs-ware.de>
Sun, 15 Jan 2012 15:04:45 +0000 (15 16:04 +0100)
tree99c68f91db857bd4f8357f62f54d252472ca3e83
parentf1faa5b7272123929d34bacf1ef70f290eb071f0
parentc98a9896f39cc6d354ec5cdbc7380194995a833d
Merge branch 'doc-putty'

Signed-off-by: Sven Strickroth <email@cs-ware.de>