]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorGustavo Lopes <glopes@nebm.ist.utl.pt>
Wed, 23 Jan 2013 12:24:50 +0000 (13:24 +0100)
committerGustavo Lopes <glopes@nebm.ist.utl.pt>
Wed, 23 Jan 2013 12:24:50 +0000 (13:24 +0100)
commitfc7b054c2d3aa0855c69b50dd7d386d558d6317e
treeb230c50d5c12d0bc9eb911e264a5971da674b0bd
parent95346c017c55e44a3e3d19945902a0275d3fafe4
parentb8b3bb08b22a28041f5c02b371a88f231ec510de
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #64023 (__toString() & SplFileInfo)
Zend/zend_vm_def.h
Zend/zend_vm_execute.h