Merge commit 'crater/master'
authorThomas Nikolajsen <thomas@dragonflybsd.org>
Wed, 11 Oct 2017 23:12:47 +0000 (01:12 +0200)
committerThomas Nikolajsen <thomas@dragonflybsd.org>
Wed, 11 Oct 2017 23:12:47 +0000 (01:12 +0200)
commit3f037272cee03e9a1e098a43189ed6939370f783
tree2c37ddfd4a3dbb3e6c3a6841a539d824bca7569b
parenta9660653ed54a7af1cb6e46ab910a8e2be16c031
parent8ea60713a8c261f24f391576c9e4ea2437e2c7f7
Merge commit 'crater/master'