commit | c17b0a202aba4cbf9490c130d3d9a4966c559fc2 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jan 20 16:01:11 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jan 20 16:01:11 2017 +0000 |
tree | 529a82d1ae9ace6a56205ae13aa1eec3e76392f0 | |
parent | 61af9d7cc27f9999e4f6e3dab9f786a074a97dee [diff] | |
parent | 46572ba904b0fb37e3a6848f292c07ff61280985 [diff] |
Merge branch 'obsd-master'