From: Xinchen Hui <laruence@php.net>
Date: Thu, 27 Jun 2013 04:38:13 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.2RC1~17^2~22^2~5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2cfc242c4f194d5192c6c37d48ee341426bdf05;p=php

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

c2cfc242c4f194d5192c6c37d48ee341426bdf05