commit | 526e860a7a831b9bab82623e64a1b30b2b1ca5e6 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Oct 09 10:01:12 2016 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Oct 09 10:01:12 2016 +0100 |
tree | bfeffb74ca872c2ce929d7da28c42826b987e810 | |
parent | fb0b2cd37ab990d859d43912e4da143f5373d496 [diff] | |
parent | 1db6d6fea6158d8d0d05e59497e40a5cfc40d068 [diff] |
Merge branch 'obsd-master'