commit | 8fa822b52106ddb80a33a81ecfbe3c5dea793f31 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Nov 18 14:01:12 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Nov 18 14:01:12 2015 +0000 |
tree | 58616aa820133f4c2c01ee1483f1df114ecad5c7 | |
parent | 93742ed5dfe3b00061ddc55884077a2537c9b43a [diff] | |
parent | 64571368dc19219fc1ef9b6c20034ee143cbed0d [diff] |
Merge branch 'obsd-master'