merged branch loalf/patch-1 (PR #835)
authorFabien Potencier <fabien.potencier@gmail.com>
Sun, 16 Sep 2012 13:20:46 +0000 (15:20 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Sun, 16 Sep 2012 13:20:46 +0000 (15:20 +0200)
Commits
-------

5c805a1 Update doc/intro.rst

Discussion
----------

Update doc/intro.rst

How to load Twig using Composer


Trivial merge