rails/rails — pull request #7033 by kron4eg (2012-07-11 13:40:43+00:00)
Title: Restore "%" ERb/Erubis Trim Mode

Fixed conflict from https://github.com/rails/rails/pull/5915 pull request