commit | 6943fbbb8123ee75915f86783a12d2c291de8d81 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Oct 03 22:01:12 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Oct 03 22:01:12 2016 +0100 |
tree | cac98c268f0d2319fbbb7d1ce64075e9f5c59669 | |
parent | 23254f59daea7415c96bc323d3b48d35c1b21327 [diff] | |
parent | 61dfbe702e61807b0b6f1e3f1767dff1d07bcfcb [diff] |
Merge branch 'obsd-master'