tree d254ddb062ed2f1acd640c892efbcb2ce2e4857a
parent 407b6b8b16eda2fa6c68b886a9aa8996b55949f6
parent 204723f0955c1e6e33a7591d20bc8b47d5d3adad
author ddekany <ddekany@apache.org> 1450221936 +0100
committer ddekany <ddekany@apache.org> 1450221936 +0100

Merge remote-tracking branch 'origin/2.3-gae'

Conflicts:
	src/main/java/freemarker/core/DebugBreak.java
	src/main/java/freemarker/core/Environment.java
	src/main/java/freemarker/core/Expression.java
	src/main/java/freemarker/core/IfBlock.java
	src/main/java/freemarker/core/Macro.java
	src/main/java/freemarker/core/TemplateObject.java
	src/main/java/freemarker/core/ThreadInterruptionSupportTemplatePostProcessor.java
	src/main/java/freemarker/core/UnifiedCall.java
	src/main/javacc/FTL.jj