]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[merge_1457] Merge branch 'master' into merge_1457
authorJelte Jansen <jelte@isc.org>
Fri, 1 Jun 2012 13:17:09 +0000 (15:17 +0200)
committerJelte Jansen <jelte@isc.org>
Fri, 1 Jun 2012 13:17:09 +0000 (15:17 +0200)

Trivial merge