| commit | ba9f32b464effc09b7ceaef21b1804c49ece17db | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 16:01:12 2016 +0100 |
| committer | Thomas Adam <thomas@xteddy.org> | Fri Apr 29 16:01:12 2016 +0100 |
| tree | b49dce19c8650ec83f435d66c4c35ccf3ee545bf | |
| parent | e7de2fe552a7b4392f208533b72e7fcbe41c0537 [diff] | |
| parent | 0d84fdd95303a6ed4dcd761425e35f3731b86725 [diff] |
Merge branch 'obsd-master'