commit | e5caf64815ae1cf46d69f0b21a970001a4eca33c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Dec 15 14:01:12 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Dec 15 14:01:12 2015 +0000 |
tree | 6ee1fae73439923b8bc962f0c781075ce24048d5 | |
parent | 1a33ea9671895258cee37cf89a209e56ecf578fb [diff] | |
parent | ac9778395feb8551e0acbd2f32465b65aeba5e05 [diff] |
Merge branch 'obsd-master'