From: Xinchen Hui <laruence@php.net>
Date: Mon, 17 Jun 2013 05:23:24 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0~17
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aa2369f85a7d188b2b1c43f5bb3478ac59039a66;p=php

Merge branch 'PHP-5.4' into PHP-5.5
---

aa2369f85a7d188b2b1c43f5bb3478ac59039a66