]> git.ipfire.org Git - thirdparty/pdns.git/commit
Merge branch 'lmdb-back' of https://github.com/mzealey/pdns into mzealey-lmdb-back
authorbert hubert <bert.hubert@netherlabs.nl>
Sat, 12 Apr 2014 17:16:45 +0000 (19:16 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Sat, 12 Apr 2014 17:16:45 +0000 (19:16 +0200)
commit0813711c42d9bfc1f2e293b8bcbeacbccdafada6
tree1c316206b5ff06691488dd203e91b895ddcf63d4
parentef2333017ed34d0eb633b2d25fc43a97de7f49d8
parent6a85d81ed3c66b4fbe1757ae70a638e0ba72f471
Merge branch 'lmdb-back' of https://github.com/mzealey/pdns into mzealey-lmdb-back

Conflicts:
.travis.yml
.travis.yml
pdns/docs/pdns.xml