tree 1a4600c7334a7906fbdd30a9e51479ffa5a81036
parent 5ecb8bb0e1db155749a4914dfd07533fc6953c39
author Nathan Bubna <nbubna@apache.org> 1228848966 +0000
committer Nathan Bubna <nbubna@apache.org> 1228848966 +0000

merge fix for VELOCITY-654 from trunk

git-svn-id: https://svn.apache.org/repos/asf/velocity/engine/branches/1.6.x@724825 13f79535-47bb-0310-9956-ffa450edef68