| commit | 4e809a3130cf1a689a33096f09d55e3b05815547 | [log] [download] | 
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Wed Mar 15 10:01:11 2017 +0000 | 
| committer | Thomas Adam <thomas@xteddy.org> | Wed Mar 15 10:01:11 2017 +0000 | 
| tree | c9163d854cc4957d2c4d8381f9369de4c72da332 | |
| parent | cc6c6edb6fb9b98f8785ed7bb2ba78f440b6ea54 [diff] | |
| parent | 3c3c08b6d9704b00a12e14772b95f7a40c20b10e [diff] | 
Merge branch 'obsd-master'