tree fb4146a5b815affc24be9fe248953c036e969bcb
parent 23a0427d940f6a2ca1243996364fea7ce4268d74
author Sergiu Dumitriu <sdumitriu@apache.org> 1449269986 +0000
committer Sergiu Dumitriu <sdumitriu@apache.org> 1449269986 +0000

Proper backport (lots of things changed)

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