commit | 7edaedf3a17dbdb20672c9dc1f8f9b2b74e40186 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon May 15 10:01:16 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon May 15 10:01:16 2017 +0100 |
tree | bafbcdbd4bd83f6186b985302297f80df684b993 | |
parent | 58f8421eacc6e7233849b589fe738d0a4011ba2c [diff] | |
parent | cb5fcb3d22513fd20dc1f7c4c6b2da3b5cdd1a8c [diff] |
Merge branch 'obsd-master'