From: Willem Toorop <willem@nlnetlabs.nl>
Date: Fri, 10 Jan 2014 20:40:02 +0000 (+0100)
Subject: Merge branch 'release-1.6.17'
X-Git-Tag: release-1.6.17^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67f9cc99ebfc62b002eaf6395928261b615b120c;p=thirdparty%2Fldns.git

Merge branch 'release-1.6.17'
---

67f9cc99ebfc62b002eaf6395928261b615b120c