| commit | 730312e60f7acb462e5e58895a61e42dc2df9434 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Tue Aug 22 00:01:10 2017 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Tue Aug 22 00:01:10 2017 +0100 |
| tree | aa41bb3cc30ef42a50360ed9c5a1a69e50bc704f | |
| parent | ccdc3690257862481c3d193d150a071fba094a11 [diff] | |
| parent | bbe9da063e1bc4e88d5954e7f2f5ad49c0aecad0 [diff] |
Merge branch 'obsd-master'