From: Xinchen Hui <laruence@php.net>
Date: Fri, 5 Apr 2013 15:28:23 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~7
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bd96813042c7aecde34e65d0e1f96ce7e8214da7;p=php

Merge branch 'PHP-5.5'
---

bd96813042c7aecde34e65d0e1f96ce7e8214da7