From: Xinchen Hui <laruence@php.net>
Date: Fri, 13 Feb 2015 04:54:04 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
X-Git-Tag: php-5.5.23RC1~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=371c016986cb9c3ddeefe16375c1a760aafa478d;p=php

Merge branch 'PHP-5.5' of https://git.php.net/repository/php-src into PHP-5.5
---

371c016986cb9c3ddeefe16375c1a760aafa478d