commit | 1f4a5b5dfec0c65899c8421132eec4cadfa97aa7 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Oct 21 00:01:19 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Oct 21 00:01:19 2015 +0100 |
tree | 9fa0298881ac03b27f0177e2e378d965f761f1ba | |
parent | af2d48f4d2493d98146490cebd3af150781a0425 [diff] | |
parent | 076034345afe0dbfef3fa1a8116a64dc7d990b51 [diff] |
Merge branch 'obsd-master'