commit | 75135ded0922986a4aa616f449978b64c15f1da9 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Dec 09 00:01:12 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Dec 09 00:01:12 2016 +0000 |
tree | aadf06fd442a81d81ea515f0e0147000cd1e32f3 | |
parent | d3ede11212b78beebea5d02a7cfc35e65e8f8349 [diff] | |
parent | 2a7b4bb01710eab0b7819f3b80edaea636ada66f [diff] |
Merge branch 'obsd-master'