| commit | 8576ecaf322e5828c86e9621015d68e755c0323b | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Tue Oct 18 12:01:10 2016 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Tue Oct 18 12:01:10 2016 +0100 |
| tree | fbf6d39f1c743c1b272dc35c2d3086a8b99552f5 | |
| parent | b3ab39c4d94a0d5785de069ba428a8ad53a0af20 [diff] | |
| parent | 2e5c49a1fd8c534d546899f7c133a0adf212a7d1 [diff] |
Merge branch 'obsd-master'