commit | 7b4b78b41943082663ba75c7dcfb4e2efa86f4c7 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Nov 14 11:38:52 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Nov 14 11:38:52 2015 +0000 |
tree | d0e771c5dcdc91a455e06a352ca6508e7803e867 | |
parent | 7b749eff3510ccf173c029a92c266e91454ce600 [diff] | |
parent | dab63b029e94dcabe335abf7f89c66c28486a542 [diff] |
Merge branch 'obsd-master'