| commit | 5bc5fe5e7e137a1644be6312778dc055f8040399 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Mon May 29 20:01:12 2017 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Mon May 29 20:01:12 2017 +0100 |
| tree | 58909ec88e31dcb1af3d0d2fbb9b2e97445c1297 | |
| parent | d3959a21185d7a1682d033982921753baa689a41 [diff] | |
| parent | a2ace9da24491c46e704ce6120dcb7e6c9d21c20 [diff] |
Merge branch 'obsd-master'