tweaked previous merge
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 28 Dec 2011 19:34:32 +0000 (20:34 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 28 Dec 2011 19:34:32 +0000 (20:34 +0100)
commit88de457774f827b1d36880eaf13cd9e1de13e980
tree9c138edcf6f03b937da2f7c3ba0d119ec88fe374
parenta9c53bc3fb38763761ac7397e7167c7002dabae8
tweaked previous merge
CHANGELOG
doc/filters/number_format.rst
lib/Twig/Extension/Core.php