| commit | 5d3296c53b820664d50d96b2b926f2c2c1105e97 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Tue Mar 07 15:32:28 2017 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Tue Mar 07 15:32:28 2017 +0000 |
| tree | 6662d3cc05fc87f840157fdac6cd489817b2e1c0 | |
| parent | 69257bc0aa8b5fbafb459f8e46985a97f840da63 [diff] | |
| parent | 1e6e606f54537c732cce48e5d3eae7fc29281fe5 [diff] |
Merge branch 'obsd-master'