From: Lars Strojny <lstrojny@php.net>
Date: Tue, 18 Sep 2012 21:17:31 +0000 (+0200)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~17^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6793e09a4ef164fac343e50c39d284fbbe3e6050;p=php

Merge branch 'PHP-5.4'
---

6793e09a4ef164fac343e50c39d284fbbe3e6050