commit | 33fbf82ac0623c53603462e17e0a2eda489867e4 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Oct 14 20:01:13 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Oct 14 20:01:13 2016 +0100 |
tree | 6ee771a949d3c7b103b616781045abfd55b9b327 | |
parent | 117737c6cae90d8c53c73fd2440eec17def10bb1 [diff] | |
parent | 0ec18e537d7f67732a789c0984bc1cb89dbb0adf [diff] |
Merge branch 'obsd-master'