commit | 65b45c9c32de273c2c3f4cbdb90b538016307746 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Aug 16 12:01:06 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Aug 16 12:01:06 2015 +0100 |
tree | ac00612a4bd70595ad608f1274b40495b248915d | |
parent | f5357ed940bd62fefdcca9791a41ca762db42599 [diff] | |
parent | 58b659a26e3c558614155ba351e7f275f277e4d3 [diff] |
Merge branch 'obsd-master'