From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Fri, 22 Mar 2013 15:32:12 +0000 (+0100)
Subject: merged branch tucksaun/fix-5.2-TSRM (PR #1037)
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=ff724c81cabe0fe6b9cffdb6fed55a92e34ba2e8;p=konrad%2Ftwig.git

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)"
---

ff724c81cabe0fe6b9cffdb6fed55a92e34ba2e8