From: Rasmus Lerdorf <rasmus@php.net>
Date: Mon, 1 Apr 2013 23:30:10 +0000 (-0700)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.6.0alpha1~448^2~57^2~22^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=608b195c593473191c89aa15eaa644eed90bfa8b;p=php

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

608b195c593473191c89aa15eaa644eed90bfa8b