]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorPierre Joye <pierre.php@gmail.com>
Fri, 17 May 2013 09:50:52 +0000 (11:50 +0200)
committerPierre Joye <pierre.php@gmail.com>
Fri, 17 May 2013 09:50:52 +0000 (11:50 +0200)
* PHP-5.4:
  entry for #64214
  other fix for #64214, unmodified file may not have old fp set, causing other possible crashes


Trivial merge