commit | 3a6beea06460826a89b43bdc85270973105e47ff | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Oct 18 22:01:12 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Oct 18 22:01:12 2016 +0100 |
tree | 053c4839855a89bfb68fae219d10c2faf73591ba | |
parent | ec47907772b8302ca23b8a8a0b406c4e39e99f47 [diff] | |
parent | e0e9a54a325da2f5648fdb6f429f22a6c12a5fb3 [diff] |
Merge branch 'obsd-master'