From: Andrey Hristov <andrey@php.net>
Date: Thu, 8 Aug 2013 12:03:11 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2~27
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d3dae9a61633ddc9a084889aa866a19f98e985da;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

d3dae9a61633ddc9a084889aa866a19f98e985da