commit | 9908681ba8fbf775f784fa6cc9f298dfa1ede426 | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Mon Nov 14 18:01:13 2016 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Mon Nov 14 18:01:13 2016 +0000 |
tree | 22eae54ccf72dc657913fae685e70b077a4f2968 | |
parent | 7177eeaa4212dfac097172444674424ae9570b41 [diff] | |
parent | afbf0d42a7776b9431ec8fd3d6f84588dc0e5212 [diff] |
Merge branch 'obsd-master'