fixed previous merge
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 27 Jul 2011 07:34:28 +0000 (09:34 +0200)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 27 Jul 2011 07:34:28 +0000 (09:34 +0200)
commit1f233ce06b0fd02da5a6769d4bb1ed07bacc9d5f
tree9c69bb298942f6e8ec33a00c583c10fc238a2b77
parenta6726c7ddd9a7c03ea005f86c1c55601933c5899
fixed previous merge
lib/Twig/Node/BlockReference.php
lib/Twig/NodeVisitor/Optimizer.php