From: Derick Rethans <github@derickrethans.nl>
Date: Thu, 18 Oct 2012 20:53:04 +0000 (+0100)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.9RC1~21^2~9^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4980b24025737234c03eb09f342b66c8c2b99109;p=php

Merge branch 'PHP-5.3' into PHP-5.4
---

4980b24025737234c03eb09f342b66c8c2b99109