]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorFelipe Pena <felipensp@gmail.com>
Tue, 24 Jul 2012 13:02:43 +0000 (10:02 -0300)
committerFelipe Pena <felipensp@gmail.com>
Tue, 24 Jul 2012 13:02:43 +0000 (10:02 -0300)
* PHP-5.4:
  - Fixed ZTS build
  Updated NES


Trivial merge