commit | 1fccfd7be5ceb56f536e0a961a46fd014d4cab4f | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Nov 29 14:01:11 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Nov 29 14:01:11 2016 +0000 |
tree | 15560c0da8b809c007cbabeec7d59b741b158af5 | |
parent | d7837cca5285dc8cdbb4fbf65a0be7694f2becec [diff] | |
parent | 6b46c62bb49c3ab532d4eba7eee226df2877490b [diff] |
Merge branch 'obsd-master'