| commit | f8b3f1622dcc250556599656e112a0068c75efab | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Wed May 10 14:01:11 2017 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Wed May 10 14:01:11 2017 +0100 |
| tree | 2afc5fffaa93d551d061ba89aef1365aa730e204 | |
| parent | daef51e038132157b08f37e365dd845847243462 [diff] | |
| parent | 0e3c5ebe1a229fbb8d829c9413ae013fb2eeb1ed [diff] |
Merge branch 'obsd-master'