tweaked previous merge
authorFabien Potencier <fabien.potencier@gmail.com>
Tue, 15 Jan 2013 19:56:11 +0000 (20:56 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Tue, 15 Jan 2013 19:56:11 +0000 (20:56 +0100)
commit7c2479d47b39d46ad1635b8633cca4f609ddea73
tree2da3af713bef79eb9c97b9a7ac7fd9a7465fd658
parent19053ab492ef95ada3cc9e01339d8f560103260f
tweaked previous merge
CHANGELOG
doc/functions/constant.rst
lib/Twig/Extension/Core.php