From: Xinchen Hui <laruence@php.net>
Date: Fri, 3 Jan 2014 03:08:06 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~54
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5f245db37dbe65bd27637fc48f2f74fff7786c5;p=php

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

b5f245db37dbe65bd27637fc48f2f74fff7786c5