commit | 7b606457320995e2f4790b758a13d26d383ae213 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Jan 16 00:01:10 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Jan 16 00:01:10 2017 +0000 |
tree | e57056522b598aee1c15e88ce8607052aa97b7a3 | |
parent | c9fcb76651cd6685ad33b845bcd0a21771964d37 [diff] | |
parent | 52847a951802fda7a3ce36cdac77c34914b0ccca [diff] |
Merge branch 'obsd-master'