From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 26 Jun 2013 18:15:15 +0000 (-0700)
Subject: Merge pull request #880 from mind04/travis2
X-Git-Tag: rec-3.6.0-rc1~624^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fbfbfe05715eef5789a8bc39177c17161f728101;p=thirdparty%2Fpdns.git

Merge pull request #880 from mind04/travis2

unbreak stuff
---

fbfbfe05715eef5789a8bc39177c17161f728101