commit | b88639304239f8f46f72fd7fbf10abb45d942f1f | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Jul 17 10:01:09 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Jul 17 10:01:09 2015 +0100 |
tree | 3d5e20c75ea877b04d52787df2ecff359d714d66 | |
parent | 8c96e2a6d941bf5438b587c3d4a5ee1c97f9aa14 [diff] | |
parent | 3192178f15c9bcc88021ceb74189173d562e7694 [diff] |
Merge branch 'obsd-master'