commit | 54c2d48d7dc6c7d7570b74682ad7914bc4915b8c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Jun 09 19:02:29 2018 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Jun 09 19:02:29 2018 +0100 |
tree | 09ba08c27cbab4b257739192d355f7e813c49aef | |
parent | 4581240cedd70be3b1dc9dd8620d22c112ce38b0 [diff] | |
parent | e6cbeb4f38d5e38df1b6b9b46145c9a2b7dd11a1 [diff] |
Merge branch 'obsd-master'