Skip to content
  • Jelte Jansen's avatar
    [master] Merge branch 'trac2184' · ad2d728d
    Jelte Jansen authored
    (conflicts purely in generated files, regenerated them)
    Conflicts:
    	doc/guide/bind10-guide.html
    	doc/guide/bind10-guide.txt
    	doc/guide/bind10-messages.html
    ad2d728d