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


Trivial merge