]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #867 from nlmark/patch-1
authorPeter van Dijk <peter@7bits.nl>
Mon, 17 Jun 2013 12:36:10 +0000 (05:36 -0700)
committerPeter van Dijk <peter@7bits.nl>
Mon, 17 Jun 2013 12:36:10 +0000 (05:36 -0700)
Applying updates mentioned in ticket #617

1  2 
pdns/docs/pdns.xml

Simple merge