| commit | 2301bee87ddfcdc307d8cb4e3f62eed9fb94d311 | [log] [download] | 
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Tue Mar 02 12:01:25 2021 +0000 | 
| committer | Thomas Adam <thomas@xteddy.org> | Tue Mar 02 12:01:25 2021 +0000 | 
| tree | ff292eb08ed29269c7829f3908cc9e265663fe02 | |
| parent | 48131c6d020220e6998512198b73819c5a085db9 [diff] | |
| parent | 81f9a23d25237f2b0c52a2867ddd2db59cc8f368 [diff] | 
Merge branch 'obsd-master' into master