From: Lars Strojny <lstrojny@php.net>
Date: Sun, 6 Jan 2013 13:54:40 +0000 (+0100)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.0alpha3~10^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=853ef3c9cba5458e403f627103d12351f88ec52f;p=php

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

853ef3c9cba5458e403f627103d12351f88ec52f