| commit | 05c97d7fe9ede1b9d185ed21242eb8470350affc | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Sat Mar 25 14:01:12 2017 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Sat Mar 25 14:01:12 2017 +0000 |
| tree | 28c3cb169ac98fb4a4a8d63a8110fcca0e7200d1 | |
| parent | 2d84ee900131214ee463d89abc051586b3a63afb [diff] | |
| parent | b9a4beb6e7d8467bf34c187aebaec794673e6efd [diff] |
Merge branch 'obsd-master'