From: Felipe Pena <felipensp@gmail.com>
Date: Tue, 24 Jul 2012 13:02:43 +0000 (-0300)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=777160f7b544971f7e73932482735af69bc42ec7;p=php

Merge branch 'PHP-5.4'

* PHP-5.4:
  - Fixed ZTS build
  Updated NES
---

777160f7b544971f7e73932482735af69bc42ec7