From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 4 Nov 2012 16:24:07 +0000 (+0000)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=37cc133d6f2e646733f299599907fdd4fc38a762;p=php

Merge branch 'PHP-5.4'
---

37cc133d6f2e646733f299599907fdd4fc38a762