commit | 1ad7c6b8f836c28a0b1353a12feca68319642d0b | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Jun 15 18:01:11 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Jun 15 18:01:11 2016 +0100 |
tree | d47d9f0be097144681d650ee363721657df6fba3 | |
parent | 5c12230a0879c7dd3ac5332dfdb9d0d7416b3557 [diff] | |
parent | 0c7ddae2abe67762b00fea10723d01251f3c156d [diff] |
Merge branch 'obsd-master'