From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 6 Dec 2012 20:30:34 +0000 (+0100)
Subject: merged branch javiereguiluz/master (PR #923)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=496537a08d83db88b35d07dc9d0b2a254df751a1;p=web%2Fkonrad%2Ftwig.git

merged branch javiereguiluz/master (PR #923)

This PR was merged into the master branch.

Commits
-------

33539fc Fixed a typo in the 'escape' filter documentation.

Discussion
----------

Fixed a typo in the 'escape' filter documentation.

This typo prevents the proper rendering of one code block.
---

496537a08d83db88b35d07dc9d0b2a254df751a1