]> git.ipfire.org Git - thirdparty/pdns.git/commit
Merge branch 'modules' of github.com:mind04/pdns into mind04-modules
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 17 May 2013 07:22:17 +0000 (09:22 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 17 May 2013 07:22:17 +0000 (09:22 +0200)
commit79ea9db2afaa19fc3b7521fb88c2893119566a94
treeca2a95875ca0f9fcd0efe242249db49311c3ddc0
parent7796a3b5e7c7ae970b6902c9591853a92859e28c
parentbb4a57397f03a506e8ba64880cc8d6f2aa22fad6
Merge branch 'modules' of github.com:mind04/pdns into mind04-modules

Conflicts:
.travis.yml
.travis.yml
configure.ac
pdns/Makefile.am