Merge branch 'master' of https://rhodecode.plunge.at/ach/ach-master
authorPepi Zawodsky <git@maclemon.at>
Mon, 4 Nov 2013 17:23:11 +0000 (18:23 +0100)
committerPepi Zawodsky <git@maclemon.at>
Mon, 4 Nov 2013 17:23:11 +0000 (18:23 +0100)
1  2 
unsorted/ssh/ssh_version_strings.txt

Simple merge