]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' into dnsdist11
authorbert hubert <bert.hubert@netherlabs.nl>
Sun, 25 Jan 2015 16:03:41 +0000 (17:03 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Sun, 25 Jan 2015 16:03:41 +0000 (17:03 +0100)
Conflicts:
pdns/pdns_recursor.cc

1  2 
.travis.yml
configure.ac
pdns/Makefile.am

diff --cc .travis.yml
Simple merge
diff --cc configure.ac
Simple merge
Simple merge