http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/impl/StaticModels.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/model/impl/StaticModels.java 
b/src/main/java/org/apache/freemarker/core/model/impl/StaticModels.java
index 04dd3a5..15b45bc 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/StaticModels.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/StaticModels.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java
 
b/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java
index 5fe309b..b049c63 100644
--- 
a/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java
+++ 
b/src/main/java/org/apache/freemarker/core/model/impl/TemplateModelListSequence.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/impl/TypeFlags.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/TypeFlags.java 
b/src/main/java/org/apache/freemarker/core/model/impl/TypeFlags.java
index d81ab74..6a5579b 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/TypeFlags.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/TypeFlags.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/impl/UnsafeMethods.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/model/impl/UnsafeMethods.java 
b/src/main/java/org/apache/freemarker/core/model/impl/UnsafeMethods.java
index b54ddbf..e3270c3 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/UnsafeMethods.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/UnsafeMethods.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/impl/_MethodUtil.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/model/impl/_MethodUtil.java 
b/src/main/java/org/apache/freemarker/core/model/impl/_MethodUtil.java
index 633687d..cc063cc 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/_MethodUtil.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/_MethodUtil.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/impl/_ModelAPI.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/_ModelAPI.java 
b/src/main/java/org/apache/freemarker/core/model/impl/_ModelAPI.java
index 660173a..3e24c65 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/_ModelAPI.java
+++ b/src/main/java/org/apache/freemarker/core/model/impl/_ModelAPI.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/impl/_StaticObjectWrappers.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/model/impl/_StaticObjectWrappers.java
 
b/src/main/java/org/apache/freemarker/core/model/impl/_StaticObjectWrappers.java
index 7c2a035..18e39b6 100644
--- 
a/src/main/java/org/apache/freemarker/core/model/impl/_StaticObjectWrappers.java
+++ 
b/src/main/java/org/apache/freemarker/core/model/impl/_StaticObjectWrappers.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/impl/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/impl/package.html 
b/src/main/java/org/apache/freemarker/core/model/impl/package.html
index 100c5c5..9c315a4 100644
--- a/src/main/java/org/apache/freemarker/core/model/impl/package.html
+++ b/src/main/java/org/apache/freemarker/core/model/impl/package.html
@@ -6,9 +6,9 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
-  
+
     http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/model/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/model/package.html 
b/src/main/java/org/apache/freemarker/core/model/package.html
index 58c3127..891509e 100644
--- a/src/main/java/org/apache/freemarker/core/model/package.html
+++ b/src/main/java/org/apache/freemarker/core/model/package.html
@@ -6,9 +6,9 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
-  
+
     http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java
index df1b872..760f28b 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/CommonMarkupOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java
index 91cba3a..c6a7894 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/CommonTemplateMarkupOutputModel.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java 
b/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java
index ab7a33d..b584ea7 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/MarkupOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java 
b/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java
index 035081a..ced33f5 100644
--- a/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java
+++ b/src/main/java/org/apache/freemarker/core/outputformat/OutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java
index 0dd9976..86dbfa3 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/UnregisteredOutputFormatException.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java
index 72d872c..6a03d54 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/CSSOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java
index b6b045b..5239e3f 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/CombinedMarkupOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java
index a9a4266..0cebf64 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/HTMLOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java
index a60e390..c420e69 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/JSONOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java
index 3144578..b2e8176 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/JavaScriptOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java
index f768888..13cddc8 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/PlainTextOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java
index d29e8aa..be38b89 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/RTFOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java
index 7a02442..345a197 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateCombinedMarkupOutputModel.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java
index fbdd73f..7bff952 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateHTMLOutputModel.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java
index 906d475..f01ff07 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateRTFOutputModel.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java
index 5ed0a6e..f0fbf1d 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXHTMLOutputModel.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java
index 4039ece..62e7867 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/TemplateXMLOutputModel.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java
index e0132a9..4dceb80 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/UndefinedOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java
index 0e8199a..4334ba3 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/XHTMLOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java
 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java
index c365dbb..644f323 100644
--- 
a/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/outputformat/impl/XMLOutputFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/package.html
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/package.html 
b/src/main/java/org/apache/freemarker/core/package.html
index e81035a..3f622ec 100644
--- a/src/main/java/org/apache/freemarker/core/package.html
+++ b/src/main/java/org/apache/freemarker/core/package.html
@@ -6,9 +6,9 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
-  
+
     http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java 
b/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java
index 616d4ef..27b4156 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/AndMatcher.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorage.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorage.java 
b/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorage.java
index 134d226..d497e55 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorage.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorage.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java
index caac175..945d049 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/CacheStorageWithGetSize.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java
index 1c49cd5..ac6cb71 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/ConditionalTemplateConfigurationFactory.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java
index 6706edf..c89a478 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/FileExtensionMatcher.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java
index 728057e..7a9692a 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/FileNameGlobMatcher.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java
index 69392f8..9b3b665 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/FirstMatchTemplateConfigurationFactory.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java
index d86d25d..3e90489 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/GetTemplateResult.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java
index dc0289f..cf19e93 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/MalformedTemplateNameException.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java
index bdbbf4e..b83b69c 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/MergingTemplateConfigurationFactory.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java 
b/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java
index 576dc56..d608282 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/NotMatcher.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java 
b/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java
index 338fb9d..922f293 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/OrMatcher.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java
index 0538268..fa4213a 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/PathGlobMatcher.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java
index 44a2260..d015b1e 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/PathRegexMatcher.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java
index 2bc6550..5b0e0cd 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactory.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java
index eee2097..26c4c7e 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateConfigurationFactoryException.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoader.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoader.java 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoader.java
index 2a58de7..60992d6 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoader.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoaderSession.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoaderSession.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoaderSession.java
index 6c85740..e5372a4 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoaderSession.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoaderSession.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java
index 2d2b29d..d937806 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResult.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResultStatus.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResultStatus.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResultStatus.java
index 52171ee..0ac8d00 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResultStatus.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingResultStatus.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingSource.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingSource.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingSource.java
index 2af5721..bfe47e4 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingSource.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLoadingSource.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java
index a37e043..f64138a 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupContext.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java
index 4917878..d9a2594 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupResult.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java
index a1c9577..ef2ad04 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateLookupStrategy.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateNameFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateNameFormat.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateNameFormat.java
index ebcbe9a..3795148 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateNameFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateNameFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
index 6c11b6a..3835e72 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateResolver.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java
index d93c701..ca38c39 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/TemplateSourceMatcher.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/_CacheAPI.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/_CacheAPI.java 
b/src/main/java/org/apache/freemarker/core/templateresolver/_CacheAPI.java
index 56598a0..09b216f 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/_CacheAPI.java
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/_CacheAPI.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/ByteArrayTemplateLoader.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/ByteArrayTemplateLoader.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/ByteArrayTemplateLoader.java
index d1e3322..417566f 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/ByteArrayTemplateLoader.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/ByteArrayTemplateLoader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/ClassTemplateLoader.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/ClassTemplateLoader.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/ClassTemplateLoader.java
index a64e6a4..331307f 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/ClassTemplateLoader.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/ClassTemplateLoader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateLookupStrategy.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateLookupStrategy.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateLookupStrategy.java
index af197ef..185f5b9 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateLookupStrategy.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateLookupStrategy.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormat.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormat.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormat.java
index 9f366f1..f85a1f8 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormat.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormat.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormatFM2.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormatFM2.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormatFM2.java
index c90b067..29b953b 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormatFM2.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateNameFormatFM2.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java
index b6e508a..2bef4cd 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/DefaultTemplateResolver.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java
index 93f99f0..e2437c1 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/FileTemplateLoader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
index 59be66f..0387d64 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/MruCacheStorage.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/MultiTemplateLoader.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/MultiTemplateLoader.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/MultiTemplateLoader.java
index 4767cad..883ec62 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/MultiTemplateLoader.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/MultiTemplateLoader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
index 9b564cf..33d3d02 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/NullCacheStorage.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
index 9b7e359..a5546fe 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/SoftCacheStorage.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/StringTemplateLoader.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/StringTemplateLoader.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/StringTemplateLoader.java
index 4f6d366..887bfce 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/StringTemplateLoader.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/StringTemplateLoader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
index e2b9d0c..eea7331 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/StrongCacheStorage.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupContext.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupContext.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupContext.java
index 0d5a95c..e9e1c00 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupContext.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupContext.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupResult.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupResult.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupResult.java
index 89fd020..cfcbf44 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupResult.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/TemplateLoaderBasedTemplateLookupResult.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoader.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoader.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoader.java
index ee143e3..8f348de 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoader.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoader.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoadingSource.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoadingSource.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoadingSource.java
index f644904..cbc1080 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoadingSource.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/URLTemplateLoadingSource.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/impl/_TemplateLoaderUtils.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/_TemplateLoaderUtils.java
 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/_TemplateLoaderUtils.java
index 763ce4c..7511fa3 100644
--- 
a/src/main/java/org/apache/freemarker/core/templateresolver/impl/_TemplateLoaderUtils.java
+++ 
b/src/main/java/org/apache/freemarker/core/templateresolver/impl/_TemplateLoaderUtils.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/templateresolver/package.html
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/templateresolver/package.html 
b/src/main/java/org/apache/freemarker/core/templateresolver/package.html
index 4b1b6cb..9f43949 100644
--- a/src/main/java/org/apache/freemarker/core/templateresolver/package.html
+++ b/src/main/java/org/apache/freemarker/core/templateresolver/package.html
@@ -6,9 +6,9 @@
   to you under the Apache License, Version 2.0 (the
   "License"); you may not use this file except in compliance
   with the License.  You may obtain a copy of the License at
-  
+
     http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing,
   software distributed under the License is distributed on an
   "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/util/BugException.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/BugException.java 
b/src/main/java/org/apache/freemarker/core/util/BugException.java
index fde2a5d..399778a 100644
--- a/src/main/java/org/apache/freemarker/core/util/BugException.java
+++ b/src/main/java/org/apache/freemarker/core/util/BugException.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java 
b/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java
index 9d86a3a..93109e0 100644
--- a/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java
+++ b/src/main/java/org/apache/freemarker/core/util/CaptureOutput.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java 
b/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java
index c882821..d2e361e 100644
--- a/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java
+++ b/src/main/java/org/apache/freemarker/core/util/DeepUnwrap.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/util/FTLUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/FTLUtil.java 
b/src/main/java/org/apache/freemarker/core/util/FTLUtil.java
index c03c9ca..b9c9e80 100644
--- a/src/main/java/org/apache/freemarker/core/util/FTLUtil.java
+++ b/src/main/java/org/apache/freemarker/core/util/FTLUtil.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/util/GenericParseException.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/util/GenericParseException.java 
b/src/main/java/org/apache/freemarker/core/util/GenericParseException.java
index e2431ec..6e53a3c 100644
--- a/src/main/java/org/apache/freemarker/core/util/GenericParseException.java
+++ b/src/main/java/org/apache/freemarker/core/util/GenericParseException.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java 
b/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java
index a686f6e..3aa8d1d 100644
--- a/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java
+++ b/src/main/java/org/apache/freemarker/core/util/HtmlEscape.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

http://git-wip-us.apache.org/repos/asf/incubator-freemarker/blob/f0ec63c2/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java
----------------------------------------------------------------------
diff --git 
a/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java 
b/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java
index 4e47eb2..f4bc5a6 100644
--- a/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java
+++ b/src/main/java/org/apache/freemarker/core/util/NormalizeNewlines.java
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY


Reply via email to