Merge branch 'openssh'
authorSascha Wildner <saw@online.de>
Sun, 25 Jan 2015 20:05:45 +0000 (21:05 +0100)
committerSascha Wildner <saw@online.de>
Sun, 25 Jan 2015 20:05:45 +0000 (21:05 +0100)

Trivial merge