commit | 8c29f7413bd41e0f7afb1b53dc73128dfd42fb6f | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Nov 02 20:01:26 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Nov 02 20:01:26 2017 +0000 |
tree | 2a8ecf685a8f14f673a6b7e1036c7d5ac79032f1 | |
parent | cf782c4f546fb11f3157de7aecff85845b0dbed9 [diff] | |
parent | 17655e5ba65e37787cd9920e1a89aedf6f623957 [diff] |
Merge branch 'obsd-master'