From: Peter van Dijk <peter@7bits.nl>
Date: Thu, 24 Apr 2014 12:38:58 +0000 (+0200)
Subject: Merge pull request #1374 from mind04/travis
X-Git-Tag: rec-3.6.0-rc1~40^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=39fe7b01aaa528ed357f720c74bdcf2fa7f0c1ef;p=thirdparty%2Fpdns.git

Merge pull request #1374 from mind04/travis

disarm two api tests after 4bd3d119
---

39fe7b01aaa528ed357f720c74bdcf2fa7f0c1ef