From: Johannes Schlüter <johannes@php.net>
Date: Thu, 3 Jan 2013 22:00:17 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~18^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c2ad8926e74c06e7ffd49b1290e72c9fb4acac5c;p=php

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

c2ad8926e74c06e7ffd49b1290e72c9fb4acac5c