[master] Merge branch 'trac3974'

author Marcin Siodelski <marcin@isc.org>

Tue, 6 Oct 2015 15:04:02 +0000 (17:04 +0200)

committer Marcin Siodelski <marcin@isc.org>

Tue, 6 Oct 2015 15:04:02 +0000 (17:04 +0200)
author Marcin Siodelski <marcin@isc.org>
Tue, 6 Oct 2015 15:04:02 +0000 (17:04 +0200)
committer Marcin Siodelski <marcin@isc.org>
Tue, 6 Oct 2015 15:04:02 +0000 (17:04 +0200)
diff --cc src/bin/dhcp6/tests/config_parser_unittest.cc
Simple merge
author	Marcin Siodelski <marcin@isc.org>
	Tue, 6 Oct 2015 15:04:02 +0000 (17:04 +0200)
committer	Marcin Siodelski <marcin@isc.org>
	Tue, 6 Oct 2015 15:04:02 +0000 (17:04 +0200)