]> git.ipfire.org Git - thirdparty/pdns.git/commit
projects / thirdparty / pdns.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: f561404 4f88dd9)
Merge branch 'rel/auth-3.3'
authorPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 5 Jul 2013 13:24:03 +0000 (15:24 +0200)
committerPeter van Dijk <peter.van.dijk@netherlabs.nl>
Fri, 5 Jul 2013 13:24:03 +0000 (15:24 +0200)
commitd3c0bc10259d732bf3bf933fb271f5f782c1e8cd
treea2d69f4e96abdd2ac7adaacc1a37cd0fc12997a6tree
parentf5614040676a9e999fa1da7c32eed73d0ff6e411commit | diff
parent4f88dd9f2caa0836ac90aef7ec24f8fbd0f617afcommit | diff
Merge branch 'rel/auth-3.3'

Conflicts:
.travis.yml
debian-pdns/rules
modules/remotebackend/testrunner.sh
modules/remotebackend/unittest_http.rb
modules/remotebackend/unittest_json.rb
modules/remotebackend/unittest_pipe.rb
modules/remotebackend/unittest_post.rb
pdns.spec
pdns/Makefile.am
pdns/misc.hh
regression-tests/start-test-stop
debian-pdns/rules diff1 | diff2 | blob | history
pdns.spec diff1 | diff2 | blob | history
pdns/nameserver.cc diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.