]> granicus.if.org Git - pdns/commitdiff
merge from master
authorMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 07:08:31 +0000 (09:08 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Fri, 3 Jan 2014 07:08:31 +0000 (09:08 +0200)
1  2 
pdns/common_startup.cc

Simple merge