From: Felipe Pena <felipensp@gmail.com>
Date: Sun, 20 Oct 2013 02:36:36 +0000 (-0300)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~5^2~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0b5c2887cdf2d9c8d9c466de88d898c30cea2d38;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  - Moved allocation to if block to make Coverity happy
---

0b5c2887cdf2d9c8d9c466de88d898c30cea2d38