From: Xinchen Hui <laruence@php.net>
Date: Sun, 9 Jun 2013 14:25:49 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~29^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3f229f43644bcf450c43103364cc8a800961c45e;p=php

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

3f229f43644bcf450c43103364cc8a800961c45e