merged branch tucksaun/fix-5.2-TSRM (PR #1037)
authorFabien Potencier <fabien.potencier@gmail.com>
Fri, 22 Mar 2013 15:32:12 +0000 (16:32 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Fri, 22 Mar 2013 15:32:12 +0000 (16:32 +0100)
commitff724c81cabe0fe6b9cffdb6fed55a92e34ba2e8
tree48c34e38367d3d993f711b8d36abd4cfd1b6980d
parent0bf57a8c9aacf60dc50b554057ca6cced3a98c00
parent438338827ba882c35526d5b3c9811caa20bb4156
merged branch tucksaun/fix-5.2-TSRM (PR #1037)

This PR was merged into the master branch.

Discussion
----------

Revert "merged branch pierrejoye/master (PR #855)"

This reverts commit 347bc81d6ed8e2bb793236aa9917c7e83f81c2b3

This commit make compilation failed for PHP5.2 with thread-safe enabled (see https://travis-ci.org/fabpot/Twig/jobs/5523865)

Commits
-------

4383388 Revert "merged branch pierrejoye/master (PR #855)"