From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 14 Feb 2015 08:48:58 +0000 (+0100)
Subject: Merge branch 'master' into dnsdist11
X-Git-Tag: dnsdist-1.0.0-alpha1~306
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a303482c853e1106f30566ec9b16e29a0b0e7082;p=thirdparty%2Fpdns.git

Merge branch 'master' into dnsdist11
---

a303482c853e1106f30566ec9b16e29a0b0e7082
diff --cc .travis.yml
index d2e75a4cee,4b960292bf..8af6bde375
--- a/.travis.yml
+++ b/.travis.yml
@@@ -7,8 -7,9 +7,9 @@@ before_script
   - sudo /sbin/ip addr add 10.0.3.0/24 dev lo
   - sudo /sbin/ip addr add 1.2.3.4/32 dev lo
   - sudo rm -f /etc/apt/sources.list.d/travis_ci_zeromq3-source.list
 - - sudo apt-get update --quiet --quiet
 + - sudo apt-get update -qq
   - sudo apt-get install --quiet --quiet --no-install-recommends
+      alien
       authbind
       bc
       bind9utils