]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f55ff56 6e8aa09)
Merge branch 'PHP-5.5'
authorDmitry Stogov <dmitry@zend.com>
Wed, 27 Mar 2013 20:10:13 +0000 (00:10 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 27 Mar 2013 20:10:13 +0000 (00:10 +0400)
* PHP-5.5:
  Fixed bug #64529 (Ran out of opcode space)

Conflicts:
Zend/zend_language_scanner.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.