merged branch arjenjb/master (PR #528)
authorFabien Potencier <fabien.potencier@gmail.com>
Wed, 23 Nov 2011 11:16:47 +0000 (12:16 +0100)
committerFabien Potencier <fabien.potencier@gmail.com>
Wed, 23 Nov 2011 11:16:47 +0000 (12:16 +0100)
commit7cfb0ecbb8b3d16cb28c69d13758072405b5e7a2
treef0f5c910f577cc169d52f262ed8dc8adc11e667a
parent84c4ba1aca5adc2967e10823ed1e5abe3f03a4f9
parentc65be3e17bd05eb3469485bfa98576ca46764a60
merged branch arjenjb/master (PR #528)

Commits
-------

c65be3e Pass around the TSRM
09d3095 Moved zval declaration
c941552 Removed globals
ffb2460 Added config.w32 for windows builds

Discussion
----------

Fixed compilation on windows
ext/twig/twig.c