commit | e1c283325ecf6496f2107efc5c8d32257017558c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Feb 03 22:01:18 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Feb 03 22:01:18 2017 +0000 |
tree | f7bf71b1bd97b81f82c611aae5567310a9d28327 | |
parent | 6c333cc4864c11283704b069fa6477876fd48f70 [diff] | |
parent | 5e6a8177e55a8e30e0cd67c7ee3039aa22ff1c0e [diff] |
Merge branch 'obsd-master'