Merge from 2.0 branch.
VelocityWriter should still be a Writer (fix from rev. 746539)

git-svn-id: https://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/engine/trunk@960033 13f79535-47bb-0310-9956-ffa450edef68
1 file changed