From: Xinchen Hui <laruence@php.net>
Date: Sun, 21 Jul 2013 08:20:00 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~377^2~1^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=25eb44fcc176491154a94046fedae9d73cb00260;p=php

Merge branch 'PHP-5.5'
---

25eb44fcc176491154a94046fedae9d73cb00260