commit | 02e04477de73d01bb3ef12cb43a03cfc4c2e546c | [log] [download] |
---|---|---|
author | Thomas Adam <thomas@xteddy.org> | Tue Feb 14 13:55:16 2017 +0000 |
committer | Thomas Adam <thomas@xteddy.org> | Tue Feb 14 13:55:16 2017 +0000 |
tree | 0c9d44339d22b35be7cd400f0a2dc2fb4b6e3779 | |
parent | c75cced07dea605b43c52375fdcc7a7bfc515ef8 [diff] | |
parent | 4c2a78029d0cb307899be42d94d3c255b97fb15f [diff] |
Merge branch 'obsd-master' Conflicts: server.c