Author: nbubna
Date: Sun Mar 28 18:29:33 2010
New Revision: 928469
URL: http://svn.apache.org/viewvc?rev=928469&view=rev
Log:
VELOCITY-755, VELOCITY-709 merge from trunk
Added:
velocity/engine/branches/2.0_Exp/src/test/org/apache/velocity/test/issues/Velocity709TestCase.java
- copied unchanged from r928463,
velocity/engine/trunk/src/test/org/apache/velocity/test/issues/Velocity709TestCase.java
Modified:
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/ParserTokenManager.java
velocity/engine/branches/2.0_Exp/src/java/org/apache/velocity/runtime/parser/node/ASTStringLiteral.java
velocity/engine/branches/2.0_Exp/src/parser/Parser.jjt