From: Xinchen Hui <laruence@php.net>
Date: Sun, 27 Oct 2013 08:53:05 +0000 (+0800)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.5.6~12^2~7^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b399be77877881f4d6eaf4ebbf23ad180ecd6ee;p=php

Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
---

9b399be77877881f4d6eaf4ebbf23ad180ecd6ee