commit | 74ecc866cf7613a3af10f400b4d59c12200d38c5 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Dec 19 16:01:20 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Dec 19 16:01:20 2017 +0000 |
tree | 35f7f43d8e254e60552aa8170d33d32f8f2adf40 | |
parent | 641a885af81c3dd16f72afc2122b8a4945d61e0f [diff] | |
parent | b20a00f93e00d73786a2bf00bd8cecb8c5392e89 [diff] |
Merge branch 'obsd-master'