From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 26 Nov 2015 07:45:33 +0000 (+0100)
Subject: Merge pull request #2932 from ahupowerdns/fixmalloc
X-Git-Tag: dnsdist-1.0.0-alpha1~200
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5604bbc680bf295d6ab4d56cf42fa56f345ff3ac;p=pdns

Merge pull request #2932 from ahupowerdns/fixmalloc

get travis to merge us again
---

5604bbc680bf295d6ab4d56cf42fa56f345ff3ac