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

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

9934efff5fa174b3ae87f3e6295a2fe48f7ebd6f