]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Merge branch 'master' of ssh://git.bind10.isc.org/var/bind10/git/bind10
authorJelte Jansen <jelte@isc.org>
Mon, 13 Feb 2012 19:13:00 +0000 (20:13 +0100)
committerJelte Jansen <jelte@isc.org>
Mon, 13 Feb 2012 19:13:00 +0000 (20:13 +0100)

Trivial merge