fixed previous merge
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 15 Feb 2012 16:24:22 +0000 (17:24 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 15 Feb 2012 16:24:22 +0000 (17:24 +0100)
commitf907eb4ac55134f680ae95171d4ec09ac052714a
tree9ca3b26e3a514bf8071331ca4649c2cc0f13b8f1
parent7d30dc6f04f48264db8a82b0341a8460735e8b5b
fixed previous merge
lib/Twig/Extension/Core.php