| commit | 48371216df07c588180b8e2246930a96e94de62b | [log] [download] | 
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Thu Apr 20 12:01:14 2017 +0100 | 
| committer | Thomas Adam <thomas@xteddy.org> | Thu Apr 20 12:01:14 2017 +0100 | 
| tree | b7fe5d01adee8885d766616fcea5ff41d773ec01 | |
| parent | e30f9dc1fae848d659295a9dfab0a5e0cf4e1a46 [diff] | |
| parent | 21993105e53da0f5aae583b494c83f1cbbf48b1b [diff] | 
Merge branch 'obsd-master'