From: Xinchen Hui <laruence@php.net>
Date: Sun, 25 Nov 2012 08:20:30 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~689^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0fa937e1067d03de9b26c767e8971d2b65c49ffd;p=php

Merge branch 'PHP-5.5'
---

0fa937e1067d03de9b26c767e8971d2b65c49ffd