From: Rasmus Lerdorf <rasmus@php.net>
Date: Thu, 20 Dec 2012 04:00:41 +0000 (-0500)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~51
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d5fe89670ee76baeb50664f5460991892ee77d8c;p=php

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

d5fe89670ee76baeb50664f5460991892ee77d8c