From: Mark Zealey <mark@markandruth.co.uk>
Date: Mon, 9 Dec 2013 11:11:49 +0000 (+0200)
Subject: Merge branch 'master' into so-reuseport
X-Git-Tag: rec-3.6.0-rc1~239^2~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2532dbeac435d9c5cc5386af2bf67ce39bf7c54e;p=thirdparty%2Fpdns.git

Merge branch 'master' into so-reuseport
---

2532dbeac435d9c5cc5386af2bf67ce39bf7c54e