From: Xinchen Hui <laruence@php.net>
Date: Thu, 25 Dec 2014 11:21:14 +0000 (-0500)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.5RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=316f72ce28f345228cc76f7ce537d593d33df765;p=php

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

316f72ce28f345228cc76f7ce537d593d33df765