| commit | 1de107c40502a713a68450f93d26171a8cbdbef4 | [log] [download] | 
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Fri Nov 04 16:01:11 2016 +0000 | 
| committer | Thomas Adam <thomas@xteddy.org> | Fri Nov 04 16:01:11 2016 +0000 | 
| tree | ca0078b03cf267667638550efc817dc1dbc74aa7 | |
| parent | a44024a795164d627833450133c6275dfcdba0b3 [diff] | |
| parent | 353439aceeed6ab311a74fc38f15276f72c654a4 [diff] | 
Merge branch 'obsd-master'