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

Merge branch 'PHP-5.5'
---

a522f2d1c985a242033eadb41a7bf98efceb7686