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

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

c7b58e49670ffce80422fe062196ddef31cdfc0a