]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Mon, 20 Oct 2014 18:22:21 +0000 (20:22 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Mon, 20 Oct 2014 18:22:21 +0000 (20:22 +0200)
1  2 
pdns/docs/pdns.xml

Simple merge