From: Thomas Markwalder <tmark@isc.org>
Date: Mon, 10 Dec 2018 16:15:32 +0000 (-0500)
Subject: [master]  Merge branch 'master' of gitlab.isc.org:isc-projects/kea
X-Git-Tag: 339-doxygen-errors_base~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d87c46a3cc7b7be4dd5f751b48449e92ee62d84;p=thirdparty%2Fkea.git

[master]  Merge branch 'master' of gitlab.isc.org:isc-projects/kea

    Re-merged with master.
---

8d87c46a3cc7b7be4dd5f751b48449e92ee62d84