From: Xinchen Hui <laruence@php.net>
Date: Thu, 11 Apr 2013 06:29:51 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~39^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bcb223a6264fcf1f732097b97d45e30542cc17cd;p=php

Merge branch 'PHP-5.5'
---

bcb223a6264fcf1f732097b97d45e30542cc17cd