| commit | 6bc3902f5d1188ea457907373011b7dd912e389c | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Thu Oct 22 12:01:09 2015 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Thu Oct 22 12:01:09 2015 +0100 |
| tree | 0d19f6952b66bdbfc68fcfc2b3779ee79d158325 | |
| parent | 0bfa615997c4691d8c3b1342d05b2ba190da99c9 [diff] | |
| parent | 31fd071faa55638bfaa337d4b62c08e34a24c8f8 [diff] |
Merge branch 'obsd-master'