commit | 54a3ed751e111833ca7f34563676d92f407709ce | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Oct 26 18:01:12 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Oct 26 18:01:12 2015 +0000 |
tree | b4f9d210100355f3560800ff0904a91cbf2fe17c | |
parent | e95df0bc3982ef7367b48236837069013642be14 [diff] | |
parent | a22fe33aa00d4e29e8d71b58b8f728d83e5d23f3 [diff] |
Merge branch 'obsd-master'