]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Mon, 17 Sep 2012 22:58:48 +0000 (15:58 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 17 Sep 2012 22:58:48 +0000 (15:58 -0700)
* PHP-5.4:
  update news
  Support building PHP with the native client toolchain.
  test should fail

1  2 
Zend/zend_alloc.c

Simple merge