commit | 6c35d17800b5d745272c45bb4c71bde80780c415 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Mar 03 16:01:11 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Mar 03 16:01:11 2016 +0000 |
tree | 818b03a3534a51d98277f2badc0df2159522510d | |
parent | 45d62482daf5264c47d68ae07061ea99382c7a54 [diff] | |
parent | df0983af39922f2ee747a244c1c718ba7ca28910 [diff] |
Merge branch 'obsd-master'