From: Stanislav Malyshev <stas@php.net>
Date: Wed, 25 Dec 2013 06:23:55 +0000 (-0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~97^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3c43a1aec181357c927077e12cbf8da0c186570;p=php

Merge branch 'PHP-5.6'

* PHP-5.6:
  5.4.25 next
---

b3c43a1aec181357c927077e12cbf8da0c186570