From: Xinchen Hui <laruence@php.net>
Date: Mon, 11 Aug 2014 09:47:36 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~12^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f496744ed07ec227b009b8b91566518a9d5f4da;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

1f496744ed07ec227b009b8b91566518a9d5f4da