From: Derick Rethans <github@derickrethans.nl>
Date: Sat, 27 Oct 2012 14:19:59 +0000 (+0100)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~18^2~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c511ee3d6411c971cd65b20e6b135260d8f22e9a;p=php

Merge branch 'PHP-5.4'
---

c511ee3d6411c971cd65b20e6b135260d8f22e9a