From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 18 Oct 2012 16:54:03 +0000 (+0100)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~20^2~10^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c165a0b6ec9cb64a5a2459059f08d0254f8e7b50;p=php

Merge branch 'PHP-5.4'
---

c165a0b6ec9cb64a5a2459059f08d0254f8e7b50