From: Jelte Jansen <jelte@isc.org>
Date: Mon, 30 Jul 2012 09:03:09 +0000 (+0200)
Subject: [master] Merge branch 'trac2148'
X-Git-Tag: trac2351_base~157
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=285c2845ca96e7ef89f9158f1dea8cda147b6566;p=thirdparty%2Fkea.git

[master] Merge branch 'trac2148'

Conflicts:
	src/lib/dns/labelsequence.h
---

285c2845ca96e7ef89f9158f1dea8cda147b6566