Merge branch '0.9'

Conflicts:
	lib/PhpParser/Template.php
	lib/PhpParser/TemplateLoader.php

CHANGELOG.md

@@ -4,8 +4,14 @@ Version 0.9.5-dev
 * Add `NodeTraverser::removeVisitor()` method, which removes a visitor from the node traverser. This also modifies the
   corresponding `NodeTraverserInterface`.
 
+* Deprecated `PHPParser_Template` and `PHPParser_TemplateLoader`. This functionality does not belong in the main project
+  and - as far as I know - nobody is using it.
+
 * Fix alias resolution in `NameResolver`: Class names are now correctly handled as case-insensitive.
 
+* The undefined variable error, which is used to the lexer to reset the error state, will no longer interfere with
+  custom error handlers.
+
 Version 0.9.4 (25.08.2013)
 --------------------------
 * [PHP 5.5] Add support for `ClassName::class`. This is parsed as an `Expr_ClassConstFetch` with `'class'` being the

doc/4_Code_generation.markdown

@@ -63,6 +63,8 @@ abstract class SomeClass extends SomeOtherClass implements A\Few, Interfaces
 Templates
 ---------
 
+> **DEPRECATED**: This feature is deprecated and will be removed in PHP-Parser 1.0.
+
 Additionally it is possible to generate code from reusable templates.
 
 As an example consider the following template, which defines a general getter/setter skeleton in terms of a property

lib/PhpParser/Template.php

@@ -2,6 +2,9 @@
 
 namespace PhpParser;
 
+/**
+ * @deprecated
+ */
 class Template
 {
     protected $parser;

lib/PhpParser/TemplateLoader.php

@@ -2,6 +2,9 @@
 
 namespace PhpParser;
 
+/**
+ * @deprecated
+ */
 class TemplateLoader
 {
     protected $parser;