From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Wed, 1 May 2013 04:48:52 +0000 (+0200)
Subject: merged branch include-x/master (PR #1068)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=90b537cc23f327d90d3a384556c7ba0b9d07f6cb;p=web%2Fkonrad%2Ftwig.git

merged branch include-x/master (PR #1068)

This PR was merged into the master branch.

Discussion
----------

Fixes typo in documentation, "if" tag

Commits
-------

da635ba Fixes typo
---

90b537cc23f327d90d3a384556c7ba0b9d07f6cb