commit | 628f3ad9f470791ea4e609bf2bef95ebac09d504 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Jan 10 10:01:11 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Jan 10 10:01:11 2017 +0000 |
tree | 912616786dceaf2fee84fa2e968e953a7a26b0d9 | |
parent | 2c862b04af15d125b6fb82f1db1ec0a59b1ffff2 [diff] | |
parent | 40fddfbdd64b7be8a32c8cb2d93d1ed80b1d81bb [diff] |
Merge branch 'obsd-master'