commit | ddfed259f69e7f4242bfba6095ce3928b81b21f0 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Oct 04 00:01:11 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Oct 04 00:01:11 2016 +0100 |
tree | dc5557a148d218d8a672f303fe3aa50c621b2f95 | |
parent | 6943fbbb8123ee75915f86783a12d2c291de8d81 [diff] | |
parent | 305c832a97c8e20136d36cf2537f65109fde7c43 [diff] |
Merge branch 'obsd-master'