commit | 31901e3c07ca3f4e51ab504aa2d752f614e761be | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Fri Oct 20 12:36:29 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Fri Oct 20 12:36:29 2017 +0100 |
tree | 4ba325087795c2fd089c14bbc095b6b5db75b19f | |
parent | a34de2e378e0cff7191a426117f44e8b81543445 [diff] | |
parent | 2f6935a630507351233d6296cc6ec9a08d6a702a [diff] |
Merge branch 'obsd-master' Conflicts: server-fn.c