]> granicus.if.org Git - pdns/commit
Merge branch 'ednssurg' of github.com:ahupowerdns/pdns into ednssurg
authorbert hubert <bert.hubert@netherlabs.nl>
Sun, 27 Sep 2015 17:44:43 +0000 (19:44 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Sun, 27 Sep 2015 17:44:43 +0000 (19:44 +0200)
commit40cf912460f219422bd4fa56f30ecd3993410a4f
treed460322af4ac938a427c1397710e3a96a4b51d11
parent3b50c08e61d06976162e375745292ecc46ab4e8a
parent48b560ea60cc89264dcb40d22404943f5db180de
Merge branch 'ednssurg' of github.com:ahupowerdns/pdns into ednssurg

Conflicts:
pdns/distributor.hh