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

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

c4de702d4e42cc74ebd7f24d12ed00f6de38d6c2