Merge branch 'upstream' into bug/init
[shibboleth/sp.git] / aclocal.m4
2008-05-08 Russ AllberyImported Upstream version 2.0