]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorRasmus Lerdorf <rasmus@lerdorf.com>
Sat, 9 Nov 2013 17:46:55 +0000 (09:46 -0800)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Sat, 9 Nov 2013 17:46:55 +0000 (09:46 -0800)
commit6713f9c4b24b5be0d543f0f87cab0f401b0c41ed
tree57c1a04064b2ae1261b14d0f84f55eae6bb0a3f0
parent0e5c5072e698438ee9857979cf8418805865518a
parentdf7321359e0c11a1de99285dee64c8e69ee28653
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix broken test