]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@powerdns.com>
Mon, 23 Nov 2015 11:09:52 +0000 (12:09 +0100)
committerbert hubert <bert.hubert@powerdns.com>
Mon, 23 Nov 2015 11:09:52 +0000 (12:09 +0100)
1  2 
pdns/syncres.cc

diff --cc pdns/syncres.cc
Simple merge