Merge commit 'upstream/2.3.1+dfsg' into bug/init
[shibboleth/sp.git] / m4 / doxygen.m4