]> git.ipfire.org Git - thirdparty/pdns.git/commit
merge with head 1133/head
authorMark Zealey <mark@markandruth.co.uk>
Mon, 13 Jan 2014 12:26:27 +0000 (14:26 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Mon, 13 Jan 2014 12:26:27 +0000 (14:26 +0200)
commit4a631875de6200c5e29aa796fe3254840fa60095
treee99184bd4d1efa7cd1a9396a68d6a0df27afca7c
parentd42f79312d0295390dc0a5829450bb6720c0191e
parentf28cf7b169fe894e4a1f471d6d4293b6ab6b5194
merge with head
pdns/common_startup.cc
pdns/docs/pdns.xml
pdns/nameserver.cc
pdns/pdns.conf-dist