[master] Merge branch 'trac3952'

author Stephen Morris <stephen@isc.org>

Thu, 24 Sep 2015 18:00:40 +0000 (19:00 +0100)

committer Stephen Morris <stephen@isc.org>

Thu, 24 Sep 2015 18:00:40 +0000 (19:00 +0100)
author Stephen Morris <stephen@isc.org>
Thu, 24 Sep 2015 18:00:40 +0000 (19:00 +0100)
committer Stephen Morris <stephen@isc.org>
Thu, 24 Sep 2015 18:00:40 +0000 (19:00 +0100)
diff --cc src/lib/dhcpsrv/tests/dhcp_parsers_unittest.cc
Simple merge
author	Stephen Morris <stephen@isc.org>
	Thu, 24 Sep 2015 18:00:40 +0000 (19:00 +0100)
committer	Stephen Morris <stephen@isc.org>
	Thu, 24 Sep 2015 18:00:40 +0000 (19:00 +0100)