From: Johannes Schlüter <johannes@php.net>
Date: Wed, 30 Jan 2013 23:59:10 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha5~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6167f9dc8de4e0b44d84a121657918f46dc8094f;p=php

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

6167f9dc8de4e0b44d84a121657918f46dc8094f