commit | 6c2039286f503e2012a58a1d109e389016e7a99b | [log] [download] |
---|---|---|
author | Damien Miller <djm@mindrot.org> | Tue Mar 03 13:48:48 2015 -0800 |
committer | Damien Miller <djm@mindrot.org> | Tue Mar 03 13:48:48 2015 -0800 |
tree | 013b71a77321df285ef5f030f91202cd34f2a78a | |
parent | 111dfb225478a76f89ecbcd31e96eaf1311b59d3 [diff] |
fix merge both that broke --without-ssh1 compile