| commit | 130b77edc737fcd113964fd77123285d78dfe3f9 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Wed Feb 08 18:01:17 2017 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Wed Feb 08 18:01:17 2017 +0000 |
| tree | d119ec705776456c59a00535a37448fee1cd83f5 | |
| parent | e09625e38b361b8ce0b8fa88851f447144f1a718 [diff] | |
| parent | 05802a6fe309e3b4559286ca5ce3c51f7367d661 [diff] |
Merge branch 'obsd-master'