]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into recpack 3274/head
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 20 Jan 2016 22:02:41 +0000 (23:02 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 20 Jan 2016 22:02:41 +0000 (23:02 +0100)

Trivial merge