]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorXinchen Hui <laruence@php.net>
Tue, 10 Jun 2014 13:58:16 +0000 (21:58 +0800)
committerXinchen Hui <laruence@php.net>
Tue, 10 Jun 2014 13:58:16 +0000 (21:58 +0800)
commitebe6854dbc1c61b303f5adbec712741b1bdcae70
treed17964f4beb026e0934101f643bd6f41dcd1bc3c
parente72ab7919678d4f0913204f25fc93166ddb69cf4
parente8699d75da9d3b0cc16b9454f12928defb6e72fc
Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
Zend/zend_execute_API.c
Zend/zend_execute_API.c