From: Xinchen Hui <laruence@php.net>
Date: Fri, 30 Aug 2013 03:23:24 +0000 (+0800)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: PRE_PHPNG_MERGE~222^2~14^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a607a08e09df9bdfbaf9c4e5bb77202d09465003;p=php

Merge branch 'PHP-5.5'
---

a607a08e09df9bdfbaf9c4e5bb77202d09465003