chiark / gitweb /
~ianmdlvl / adns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 495cc83 c6545b9)
Merge branch 'master' of chiark:public-git/adns
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 26 Oct 2014 14:58:21 +0000 (14:58 +0000)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 26 Oct 2014 14:58:21 +0000 (14:58 +0000)

Trivial merge
adns master upstream repository