From: Rasmus Lerdorf <rasmus@php.net>
Date: Thu, 20 Sep 2012 18:22:55 +0000 (-0400)
Subject: Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
X-Git-Tag: php-5.4.9RC1~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f037ddc85971496f985d0cea540129b9d928bb97;p=php

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

f037ddc85971496f985d0cea540129b9d928bb97