From: Willem Toorop Date: Wed, 8 Jan 2014 14:35:49 +0000 (+0100) Subject: Merge branch 'release-1.6.17' into develop X-Git-Tag: release-1.7.0-rc1~188 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7e90cbb388aa06b134a0b07c3d17977feea5029;p=thirdparty%2Fldns.git Merge branch 'release-1.6.17' into develop --- f7e90cbb388aa06b134a0b07c3d17977feea5029