commit | 36181775cdb25569013778635aec34f3d3e62e91 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon May 15 18:01:14 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon May 15 18:01:14 2017 +0100 |
tree | 6f9ab8531fd1a8210ebd00356b8dc831d0c90dd7 | |
parent | 7edaedf3a17dbdb20672c9dc1f8f9b2b74e40186 [diff] | |
parent | b160de5cb4cf901e0d01594308f8f4f54df9e2a9 [diff] |
Merge branch 'obsd-master'