]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorRasmus Lerdorf <rasmus@lerdorf.com>
Sat, 9 Nov 2013 17:46:43 +0000 (09:46 -0800)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Sat, 9 Nov 2013 17:46:43 +0000 (09:46 -0800)
commitdf7321359e0c11a1de99285dee64c8e69ee28653
treea5b1e24fe496faec0dbfd524661e1e7446ce3c1f
parent915c428ba1006a144c4fca45e44631ec058a5074
parent064ba179b15bda7566fa43297e2cee8033bc850f
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix broken test