]> git.ipfire.org Git - thirdparty/pdns.git/commit
Merge branch 'master' into fix-reload 1131/head
authorMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 08:43:50 +0000 (10:43 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 08:43:50 +0000 (10:43 +0200)
commit7744e0ee26751a262b00f8489b0ab5bda7cb94c6
tree8521723d0b866ec4e3fc34d1779b6b8aebb89f0c
parent85a41ee709ffe087291e530078745f5ac1ff9c37
parentd951e52061fcee56766ea513e172e0602d5cdb41
Merge branch 'master' into fix-reload
pdns/ueberbackend.cc
pdns/ueberbackend.hh