From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 14 Dec 2012 00:42:50 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha2~13
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3925683d46d399b0363a2ccbe0267a9e2922b237;p=php

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

3925683d46d399b0363a2ccbe0267a9e2922b237