From: Xinchen Hui <laruence@php.net>
Date: Thu, 15 Aug 2013 03:50:54 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~292^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d3ec0c3ca4d6b13309ffc79e12faeb930ffaf69;p=php

Merge branch 'PHP-5.5'
---

7d3ec0c3ca4d6b13309ffc79e12faeb930ffaf69