From: Stephen Morris <stephen@isc.org>
Date: Tue, 12 Feb 2013 12:28:02 +0000 (+0000)
Subject: [2681] Merge branch 'master' into trac2681
X-Git-Tag: bind10-1.0.0-rc-release~22^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf0ce4bad603660b8f0d98e76414fd5b3572e2c8;p=thirdparty%2Fkea.git

[2681] Merge branch 'master' into trac2681

Conflicts:
	src/lib/dhcpsrv/alloc_engine.cc
---

cf0ce4bad603660b8f0d98e76414fd5b3572e2c8