Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Sat, 12 Aug 2017 19:29:46 +0000 (21:29 +0200)
committermirabilos <m@mirbsd.org>
Sat, 12 Aug 2017 19:29:46 +0000 (21:29 +0200)
1  2 
src/client.c

diff --cc src/client.c
Simple merge