commit | cb77c2aa78c77b0dada2964e140045e85ce53dbb | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jun 25 19:02:24 2018 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jun 25 19:02:24 2018 +0100 |
tree | cd0c68a320a279aab5a1f25ae300a49fd76e4566 | |
parent | 94712a8b0df6d5de21409e762e462371fb5e8497 [diff] | |
parent | 0c94c3fbee3df39293de8b7fd957392251113a74 [diff] |
Merge branch 'obsd-master'