From: Xinchen Hui <laruence@php.net>
Date: Sun, 21 Jul 2013 08:19:13 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~13^2~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=629965abe20b9d4ed4a793570791c983e705aa49;p=php

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

629965abe20b9d4ed4a793570791c983e705aa49