[master] Merge branch 'trac5376'

author Marcin Siodelski <marcin@isc.org>

Tue, 17 Oct 2017 17:05:10 +0000 (19:05 +0200)

committer Marcin Siodelski <marcin@isc.org>

Tue, 17 Oct 2017 17:05:10 +0000 (19:05 +0200)
author Marcin Siodelski <marcin@isc.org>
Tue, 17 Oct 2017 17:05:10 +0000 (19:05 +0200)
committer Marcin Siodelski <marcin@isc.org>
Tue, 17 Oct 2017 17:05:10 +0000 (19:05 +0200)
diff --cc src/bin/dhcp4/tests/shared_network_unittest.cc
Simple merge
author	Marcin Siodelski <marcin@isc.org>
	Tue, 17 Oct 2017 17:05:10 +0000 (19:05 +0200)
committer	Marcin Siodelski <marcin@isc.org>
	Tue, 17 Oct 2017 17:05:10 +0000 (19:05 +0200)