]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e6577ae 54b57c9)
Merge branch 'master' into split-distributor
authorMark Zealey <mark@markandruth.co.uk>
Sat, 14 Dec 2013 21:45:36 +0000 (23:45 +0200)
committerMark Zealey <mark@markandruth.co.uk>
Sat, 14 Dec 2013 21:45:36 +0000 (23:45 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.