]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'config_documentation'
authorMarek Vavruša <marek.vavrusa@nic.cz>
Sun, 12 Apr 2015 19:57:44 +0000 (21:57 +0200)
committerMarek Vavruša <marek.vavrusa@nic.cz>
Sun, 12 Apr 2015 19:57:44 +0000 (21:57 +0200)

Trivial merge