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

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

b16463a9fb7e376a10722284ea8b2344754ef051