]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'master' into trac2571_commit_log_fix
authorShane Kerr <shane@isc.org>
Mon, 21 Jan 2013 19:33:32 +0000 (20:33 +0100)
committerShane Kerr <shane@isc.org>
Mon, 21 Jan 2013 19:33:32 +0000 (20:33 +0100)

Trivial merge