commit | a3428487a787c9ab43cd628338dcc290499891ae | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jan 06 14:01:15 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 06 14:01:15 2017 +0000 |
tree | a82222b0cd94e22370eaae0ed6a8c679202e10e5 | |
parent | 58642011df2ccb02d405626e641ad9f11945a276 [diff] | |
parent | cae0fbbe8c7cc16ac38aa8149ef9b4e2a54bce0e [diff] |
Merge branch 'obsd-master'