From: Xinchen Hui <laruence@php.net>
Date: Wed, 9 Jul 2014 10:35:01 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: POST_PHPNG_MERGE~71^2^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2c71ea1a99b5dc6c71383e71835142de7b79d99b;p=php

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

2c71ea1a99b5dc6c71383e71835142de7b79d99b