| commit | 6ebd7375909224a039c9afe8e834af2aba5727b9 | [log] [download] | 
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Wed Apr 18 15:02:25 2018 +0100 | 
| committer | Thomas Adam <thomas@xteddy.org> | Wed Apr 18 15:02:25 2018 +0100 | 
| tree | cd7ccc4481d4ff20bf9c10088286b5db4f31c5b4 | |
| parent | ae0b7c7d7292d83ab46b327c4c428ca0eebbc966 [diff] | |
| parent | e64d078a4c9fc0286f5a882fcc526ae8783055ed [diff] | 
Merge branch 'obsd-master'