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

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  5.4.25 next
---

c6df27db0fbca529ff7cf25668f45639d45ecaea