From: Xinchen Hui <laruence@php.net>
Date: Fri, 13 Mar 2015 16:53:32 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~81
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=396bc00caa528e71158c3808478f5a10a8db0f06;p=php

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

396bc00caa528e71158c3808478f5a10a8db0f06