commit | ed17760a52a21c9a94719b8f729f2539a2ee6503 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Thu Sep 24 10:01:09 2015 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Thu Sep 24 10:01:09 2015 +0100 |
tree | f82dfbe9d943ff6a19d0a96b5bae141b09d0f554 | |
parent | 06d4553a15db5b7b018e0d5a97a355ca341b0168 [diff] | |
parent | ddb2d1221b3a824114e7c456251c4cf983b0b330 [diff] |
Merge branch 'obsd-master'