commit | 6749a30a6e1a6467b8ce688cc5c1c245224ef013 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Nov 30 14:01:11 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Nov 30 14:01:11 2016 +0000 |
tree | 9823be83adb20d13276b38faf32fe56d454f1690 | |
parent | 1fccfd7be5ceb56f536e0a961a46fd014d4cab4f [diff] | |
parent | 1a6156d8fdc1ff53cd5987a0e6d2d3eeaaadc2ed [diff] |
Merge branch 'obsd-master'