commit | bc4f72582010b99183fda910dd8ad250b2a503e8 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 20:01:09 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 20:01:09 2016 +0100 |
tree | b284ff1befdcc7850d57b576cf055adb628bb6fe | |
parent | 55d472a9fe9b3d4196b8307a65480f6d66b95e9c [diff] | |
parent | 975aa3ccd61ae5981ea1174c43603b6bdad097f1 [diff] |
Merge branch 'obsd-master'