commit | c975de2e07bdb21c85fc4f2c14a17bc00ca63aff | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Sat Oct 31 23:56:35 2015 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Sat Oct 31 23:56:35 2015 +0000 |
tree | 70ff97109da24dc7273b59df6ef6a9f298e16c48 | |
parent | 17f6c3be8eeb0b67d07f916026dab918795c0317 [diff] | |
parent | ba7fb49fb9b972a03547381783abe91be3fcfa37 [diff] |
Merge branch 'obsd-master' Conflicts: server.c