commit | 4b482c95c3ec532dac2b2ff2dec359dc96c3069c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Jan 28 18:01:12 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Jan 28 18:01:12 2017 +0000 |
tree | ada66e66eb8392f4279518e80fc8a46191648db5 | |
parent | 503af3df547d3cf4ffef2b80ab28edd341d1ca0f [diff] | |
parent | 54309cc25d4bf9e144342179d815e459c88d6153 [diff] |
Merge branch 'obsd-master'