]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 4 Jun 2014 18:24:25 +0000 (20:24 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 4 Jun 2014 18:24:25 +0000 (20:24 +0200)
1  2 
pdns/pdns_recursor.cc

Simple merge