From: Rasmus Lerdorf <rasmus@php.net>
Date: Fri, 14 Dec 2012 00:54:31 +0000 (-0800)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha2~12^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=77c4b84ac893a6e4824a58d17475149f6a1c2322;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

77c4b84ac893a6e4824a58d17475149f6a1c2322