]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.3' into PHP-5.4
authorXinchen Hui <laruence@php.net>
Sun, 29 Jul 2012 05:26:05 +0000 (13:26 +0800)
committerXinchen Hui <laruence@php.net>
Sun, 29 Jul 2012 05:26:05 +0000 (13:26 +0800)
commitc6ad98975ede538d35850dbe62bac6cc4b3fd48e
treefcf11d1899f1ed328ba214de2f05ca05098ce768
parent11e84180efeeb7e7443adc4c50a3d7886828994d
parent880a6cee0068e980fd1eed735675d9b7d37968a0
Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
  Skip test while zend mm is disabled