commit | 7f83b53027c98589b516c4137a2fbc48a70e230b | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sun Sep 10 11:39:45 2017 +0100 |
committer | Thomas Adam <thomas@xteddy.org> | Sun Sep 10 11:39:45 2017 +0100 |
tree | 87ea32d30c8dc7f8844e0f9d19a99e967fb92d2c | |
parent | c62cfe64c8aabd91ea977950b63a3bc956015143 [diff] | |
parent | 8405fcdd9b62e22003923a22edfefdaf42883a98 [diff] |
Merge branch 'obsd-master' Conflicts: server-client.c