commit | de4f817bd61d60ac4310052d51ba437826016df0 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Apr 18 20:01:12 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Apr 18 20:01:12 2017 +0100 |
tree | dfa37d48dea949f9dd3d7321a77f3c850c77b8f5 | |
parent | a54309147dc4085a312d18d0c5421fbe14d85764 [diff] | |
parent | 623e35f5946498d0e89127756fb49258f768a6d0 [diff] |
Merge branch 'obsd-master'