Merge branch 'mirbsd' cvs-2--1_12_13_real-18
authormirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 22:47:36 +0000 (00:47 +0200)
committermirabilos <m@mirbsd.org>
Sat, 22 Oct 2016 22:47:36 +0000 (00:47 +0200)
commit1ae50536fc85d9190c474095181949a473a04c0f
tree30a15bc45d1f188f606a5dbc9b4a8a685f433b54
parentdf0e232d0260c67acd908acb186076556fd39aaa
parentb195b7ca398781bb4e5ff375ac616f7a377373d1
Merge branch 'mirbsd'