Mark branch 'mirbsd' as merged
authormirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 20:17:33 +0000 (22:17 +0200)
committermirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 20:17:33 +0000 (22:17 +0200)

Trivial merge