commit | 8c3981366574f5c6496985e0127ca817f3d70037 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Oct 22 14:01:12 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Oct 22 14:01:12 2015 +0100 |
tree | 98ebbee2088ac29bc7e1cf8d26699b02c1c2da42 | |
parent | 6bc3902f5d1188ea457907373011b7dd912e389c [diff] | |
parent | 3ebcf25149d75977ea97e9d4f786e0508d1a0d5e [diff] |
Merge branch 'obsd-master'