commit | 9b1f620aa017bb3634b3806e959580cde75ec655 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Wed Feb 01 12:01:18 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Wed Feb 01 12:01:18 2017 +0000 |
tree | 2112ace73236adcc27200cecedf6688eade17f7a | |
parent | 9b9a5a292d656f14c927a36bf77af4a4cf1ecb3a [diff] | |
parent | dd0c8147795c518de443c33895c614e52b42677f [diff] |
Merge branch 'obsd-master'