]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Fri, 29 May 2015 19:18:04 +0000 (21:18 +0200)
committerAnatol Belski <ab@php.net>
Fri, 29 May 2015 19:18:04 +0000 (21:18 +0200)
commit8e02be16d7f6e50991145a21d0ca76ddb9a3ce32
treecb64b7379ae3d3a9b304a0a2032efdc9d205a1ef
parente7d0ca39e5030226d3c237a481b1c50d8a2db2f3
parent5683b6fa3962f483a407ca17d49397b203ed4145
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Refactored the fix for bug #66084, by cmb@php.net
  Merge the fix for #69703 to 5.5 per request from Julien