From: Xinchen Hui <laruence@php.net>
Date: Sun, 25 Nov 2012 04:05:09 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~692
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=62c3ef9c32e105cdab3bb7b59639cff1946a899a;p=php

Merge branch 'PHP-5.5'
---

62c3ef9c32e105cdab3bb7b59639cff1946a899a