From: Rasmus Lerdorf <rasmus@lerdorf.com>
Date: Sun, 20 Oct 2013 16:37:25 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~5^2~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=288a4ec3bd4a9e93d9cadc045d6ca9472081a3ec;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Clean up this weird safe_emalloc() call
---

288a4ec3bd4a9e93d9cadc045d6ca9472081a3ec