commit | 325c85a5c163c3063518cb8baf939c44bae39a3e | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Jan 07 18:01:11 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Jan 07 18:01:11 2017 +0000 |
tree | 40db7d87a72eff76cf4eb851e916117242c3fe41 | |
parent | 29e64a8c648eaf6e1bebf6018066991e032756ab [diff] | |
parent | c05002b0f2d86d7706efdc9636ee660642bdcecb [diff] |
Merge branch 'obsd-master'