From: Tomek Mrugalski <tomasz@isc.org>
Date: Fri, 10 Feb 2017 14:50:32 +0000 (+0100)
Subject: Merge branch 'Doxyfile' of https://github.com/andreipavelQ/kea into andreipavelQ... 
X-Git-Tag: trac3590_base~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ce72998382b62269823fa0dcbfa41dfa9c72b69e;p=thirdparty%2Fkea.git

Merge branch 'Doxyfile' of https://github.com/andreipavelQ/kea into andreipavelQ-Doxyfile

# Conflicts:
#	doc/Doxyfile
---

ce72998382b62269823fa0dcbfa41dfa9c72b69e