From: Rasmus Lerdorf <rasmus@lerdorf.com>
Date: Sun, 20 Oct 2013 16:37:40 +0000 (-0700)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~227^2~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b2a4c168ef10a2a476f91f6a933c5c3a00f68af;p=php

Merge branch 'PHP-5.5'

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

7b2a4c168ef10a2a476f91f6a933c5c3a00f68af