]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorXinchen Hui <laruence@php.net>
Sun, 29 Jul 2012 04:20:05 +0000 (12:20 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 29 Jul 2012 04:20:05 +0000 (12:20 +0800)
* PHP-5.4:
  Skip test while zend_mm is disabled


Trivial merge