From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 21 May 2014 18:32:09 +0000 (-0400)
Subject: [master] Merge branch 'trac3382'
X-Git-Tag: trac3434_base~28
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b5cd680f78a2dcaec09f2791a05fc74348156d1;p=thirdparty%2Fkea.git

[master] Merge branch 'trac3382'

Fixed Conflicts in:
	src/bin/d2/tests/nc_test_utils.cc
	src/lib/dns/tests/labelsequence_unittest.cc
---

7b5cd680f78a2dcaec09f2791a05fc74348156d1