| commit | 35f582583a208f39bda248b50e50c1c0adec3cf0 | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Wed Oct 21 14:01:09 2015 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Wed Oct 21 14:01:09 2015 +0100 |
| tree | 9acfdd9b373575205891a29c8b65527b2ced4273 | |
| parent | 1f4a5b5dfec0c65899c8421132eec4cadfa97aa7 [diff] | |
| parent | ddbc4a0f6ca0c6486a038ce91971212785d44744 [diff] |
Merge branch 'obsd-master'