From: Johannes Schlüter <johannes@php.net>
Date: Thu, 21 Feb 2013 14:10:47 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha6~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7b719235b3547236a7297e566d5da90bab9674d8;p=php

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

7b719235b3547236a7297e566d5da90bab9674d8