commit | 154c95d0c97172d1a23c469451e9cacad4b98b90 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Jun 13 13:48:37 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Jun 13 13:48:37 2017 +0100 |
tree | e762e66f1a86be12b07dc6f21364e9c4faf05c0f | |
parent | a073d11c3e05af2b691e89aae1101f1a0904f9b3 [diff] | |
parent | ac7080b31b7d470467bd756d83c4803d6e0c3230 [diff] |
Merge branch 'obsd-master'