commit | 2ee0962c9685c8b3ffbdf494771d2e4fa97cc974 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jul 02 15:02:25 2018 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jul 02 15:02:25 2018 +0100 |
tree | e49cdb371550ec56015455aa6cca06f949617e16 | |
parent | ffebf005854b6308485fd375944995730e146be4 [diff] | |
parent | 42935bde71df2bc4ae765a27571f5dadff542e70 [diff] |
Merge branch 'obsd-master'