Merge branch 'mirbsd'
authormirabilos <m@mirbsd.org>
Fri, 21 Oct 2016 22:06:24 +0000 (00:06 +0200)
committermirabilos <m@mirbsd.org>
Fri, 21 Oct 2016 22:06:24 +0000 (00:06 +0200)
1  2 
src/main.c

diff --cc src/main.c
Simple merge