]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Merge branch 'master' of git.mindrot.org:/var/git/openssh
authorTim Rice <tim@multitalents.net>
Thu, 4 Jun 2015 04:43:13 +0000 (21:43 -0700)
committerTim Rice <tim@multitalents.net>
Thu, 4 Jun 2015 04:43:13 +0000 (21:43 -0700)

Trivial merge