From: JINMEI Tatuya <jinmei@wide.ad.jp>
Date: Sat, 31 Oct 2015 09:49:53 +0000 (+0900)
Subject: Merge branch 'trac4027' of github.com:isc-projects/kea into trac4027
X-Git-Tag: trac4110_base~2^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2accef346abe04a0364eb1414302be12d6f4e44b;p=thirdparty%2Fkea.git

Merge branch 'trac4027' of github.com:isc-projects/kea into trac4027

with resolving conflict (the HEAD version wasn't complete)
	src/lib/dhcp/tests/pkt4o6_unittest.cc
---

2accef346abe04a0364eb1414302be12d6f4e44b