tree be931f153e33e6314f3a5252a374a1f525a355b6
parent cbf9e62519161603231d1fa821b3497b6f9c7734
author Stefan Bodewig <bodewig@apache.org> 1337668192 +0000
committer Stefan Bodewig <bodewig@apache.org> 1337668192 +0000

merge changes from 1.8.4

git-svn-id: https://svn.apache.org/repos/asf/ant/core/branches/ANT_18_BRANCH@1341315 13f79535-47bb-0310-9956-ffa450edef68