[master] Merge branch 'trac3918' (KEA_SOCKET_TEST_DIR variable)
Conflicts: src/lib/util/tests/socketsession_unittest.cc
doc/devel/qa.dox
0 → 100644
Please register or sign in to comment
Conflicts: src/lib/util/tests/socketsession_unittest.cc