]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'alias'
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 8 Oct 2014 11:10:35 +0000 (13:10 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 8 Oct 2014 11:10:35 +0000 (13:10 +0200)

Trivial merge