From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 8 Jun 2017 14:56:14 +0000 (+0200)
Subject: [master] Merge branch 'trac5189'
X-Git-Tag: trac5243_base~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e48d9399c215406f2dab1601d22d6c932b4af271;p=thirdparty%2Fkea.git

[master] Merge branch 'trac5189'

# Conflicts:
#	src/bin/agent/ca_command_mgr.h
#	src/bin/agent/tests/ca_command_mgr_unittests.cc
#	src/lib/asiolink/testutils/test_server_unix_socket.cc
---

e48d9399c215406f2dab1601d22d6c932b4af271