From: Lars Strojny <lstrojny@php.net>
Date: Mon, 14 Jan 2013 17:00:00 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha4~18
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ec228129894cae4560a7a1a3f10ee380f14a4c3;p=php

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

3ec228129894cae4560a7a1a3f10ee380f14a4c3