| commit | 5512de6a61addc2342c710df8461b49ab3f3128d | [log] [download] | 
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Fri Mar 23 10:02:30 2018 +0000 | 
| committer | Thomas Adam <thomas@xteddy.org> | Fri Mar 23 10:02:30 2018 +0000 | 
| tree | 58595d2714eca73ecacb757a1b0a74f646db3df0 | |
| parent | 919f55ac4a927712e463d8c59bfebc91d50058e2 [diff] | |
| parent | 26792b90357213b98a990b97fd6dc4333a00adcb [diff] | 
Merge branch 'obsd-master'