dotCMS/dotCMS — pull request #4959 by dotjorgeu (2014-02-24 16:11:25+00:00)
Title: Conflicts: bring to master #4931

src/com/dotmarketing/cms/comment/action/CommentsAction.java
src/com/dotmarketing/util/ServletResponseCharacterEncoding.java
src/com/dotmarketing/velocity/VelocityServlet.java