]> granicus.if.org Git - pdns/commitdiff
merge with origin
authorMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 06:58:35 +0000 (08:58 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 06:58:35 +0000 (08:58 +0200)
1  2 
pdns/common_startup.cc

Simple merge