[master] Merge branch 'trac5365'

author Marcin Siodelski <marcin@isc.org>

Tue, 24 Oct 2017 19:06:59 +0000 (21:06 +0200)

committer Marcin Siodelski <marcin@isc.org>

Tue, 24 Oct 2017 19:06:59 +0000 (21:06 +0200)
author Marcin Siodelski <marcin@isc.org>
Tue, 24 Oct 2017 19:06:59 +0000 (21:06 +0200)
committer Marcin Siodelski <marcin@isc.org>
Tue, 24 Oct 2017 19:06:59 +0000 (21:06 +0200)
diff --cc src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
Simple merge
author	Marcin Siodelski <marcin@isc.org>
	Tue, 24 Oct 2017 19:06:59 +0000 (21:06 +0200)
committer	Marcin Siodelski <marcin@isc.org>
	Tue, 24 Oct 2017 19:06:59 +0000 (21:06 +0200)