From: Xinchen Hui <laruence@php.net>
Date: Fri, 18 Jul 2014 07:50:42 +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.17RC1~52
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=920e81b6f1f9bf5c343104351a3a6ab581c1bdb6;p=php

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

920e81b6f1f9bf5c343104351a3a6ab581c1bdb6