]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
authorXie Jiagui <xiejiagui@cnnic.cn>
Thu, 15 Mar 2012 01:35:37 +0000 (09:35 +0800)
committerXie Jiagui <xiejiagui@cnnic.cn>
Thu, 15 Mar 2012 01:35:37 +0000 (09:35 +0800)

Trivial merge