]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0725e5 3cc5e4d)
Merge remote-tracking branch 'origin/master' into recpack
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
Unnamed repository; edit this file 'description' to name the repository.