commit | 28833efb4801aedd43f4fc119d4fe841fde848eb | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Apr 17 10:01:13 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Apr 17 10:01:13 2017 +0100 |
tree | 9678d0e104544816b08bf75cbab5e28a3e575088 | |
parent | d912687be76891cdf5d124d278bf42b0bebd3106 [diff] | |
parent | 175d1854d4b5886c5ad8a77c153ced2b8f15621a [diff] |
Merge branch 'obsd-master'