Merging a fix for merging


git-svn-id: https://svn.apache.org/repos/asf/santuario/xml-security-java/tags/xmlsec-1.5.7@1606100 13f79535-47bb-0310-9956-ffa450edef68
6 files changed