]> granicus.if.org Git - pdns/commitdiff
projects / pdns / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46ef19a 8439c4e)
Merge branch 'jsonzone2sql' of github.com:ahupowerdns/pdns into jsonzone2sql
authorbert hubert <bert.hubert@netherlabs.nl>
Thu, 24 Apr 2014 07:14:14 +0000 (09:14 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Thu, 24 Apr 2014 07:14:14 +0000 (09:14 +0200)

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