fixed previous merge
authorFabien Potencier <fabien.potencier@gmail.com>
Tue, 16 Oct 2012 12:38:15 +0000 (14:38 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Tue, 16 Oct 2012 12:39:58 +0000 (14:39 +0200)
commitbac6bc7851c51692af1d855065e88b564e047b3b
tree803451b4fb815b83ad9f00d5f0e8403ad0f09e50
parenta2981f7d8c3555d183f7ce8138c4bccd4d15dffd
fixed previous merge
CHANGELOG
doc/filters/split.rst
lib/Twig/Extension/Core.php