]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
Merge branch 'isc-master' into isc-option-definitions
authorAndrei Pavel <andrei.pavel@qualitance.com>
Wed, 22 Jun 2016 12:06:24 +0000 (15:06 +0300)
committerAndrei Pavel <andrei.pavel@qualitance.com>
Wed, 22 Jun 2016 12:06:24 +0000 (15:06 +0300)

Trivial merge