commit | 15b6774f9b9649a0bf3dfe736dd91f4791e5b0fb | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Nov 02 14:01:10 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Nov 02 14:01:10 2016 +0000 |
tree | c5db51196543e2a924427f27a83a89875ba6dc0b | |
parent | 5da94182ae37cfdbec131b0c2ea01a8606431650 [diff] | |
parent | 382e09bed1bcf83eed98a36afa15f7dc9de18e72 [diff] |
Merge branch 'obsd-master'