From: Karel Slany <karel.slany@nic.cz>
Date: Wed, 28 Aug 2013 09:30:13 +0000 (+0200)
Subject: Merge branch 'master' into pyldns
X-Git-Tag: release-1.6.17rc1~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf1b448b1d55869a9c8381bc638dda48529f9107;p=thirdparty%2Fldns.git

Merge branch 'master' into pyldns
---

cf1b448b1d55869a9c8381bc638dda48529f9107