]> granicus.if.org Git - php/commitdiff
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)
* PHP-5.4:
  Fixed incorrect argument number

1  2 
Zend/zend_compile.c

Simple merge