| commit | f1282a683de191d00e6f71cc4a7d4c9646fff3de | [log] [download] |
|---|---|---|
| author | Thomas Adam <thomas@xteddy.org> | Tue Jan 24 14:01:15 2017 +0000 |
| committer | Thomas Adam <thomas@xteddy.org> | Tue Jan 24 14:01:15 2017 +0000 |
| tree | 791864b06b0b4127781b214096b7925dbd29ec43 | |
| parent | c68ea386d13a08d89c2fcd1fd3f0dde91fd0ff27 [diff] | |
| parent | 3d74e89a395838e5c9c4ea101a9366be09bf03c7 [diff] |
Merge branch 'obsd-master'