From: Xinchen Hui <laruence@php.net>
Date: Mon, 30 Dec 2013 03:07:37 +0000 (+0800)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~72
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5a756afcf14fada75f6ed8052cd97924dd229ed8;p=php

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

5a756afcf14fada75f6ed8052cd97924dd229ed8