commit | d2eab39ffa42a0d5d8e796cbe3352f951f42b4f7 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Jan 22 20:01:12 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Jan 22 20:01:12 2017 +0000 |
tree | 1f48f40745065f1e31cbf6ebb0ed0cd6dd522a60 | |
parent | aa70f28069739d968502ef5a8048ffe8fbd10ffe [diff] | |
parent | 4ede35c48c089abe3fca0d94dbeac44b2ac442a1 [diff] |
Merge branch 'obsd-master'