]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Wed, 29 May 2013 07:14:15 +0000 (11:14 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 29 May 2013 07:14:15 +0000 (11:14 +0400)
commit7e00d0994f666f9ed698f86bcd88087ebabe2bfe
tree66946b315c92bd3cac7e064bf445aac71576c52d
parentad90e90d904842cf95684111dececce311b8ef7d
parent8b515fa00ad844af82158449ee3d5d1c72a93451
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed incorrect argument number
Zend/zend_compile.c