]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorRasmus Lerdorf <rasmus@lerdorf.com>
Sun, 20 Oct 2013 16:37:40 +0000 (09:37 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Sun, 20 Oct 2013 16:37:40 +0000 (09:37 -0700)
* PHP-5.5:
  Clean up this weird safe_emalloc() call


Trivial merge