From: Derick Rethans <github@derickrethans.nl>
Date: Sun, 6 Jan 2013 15:07:13 +0000 (+0000)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0alpha3~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ba35ae32b7e9858e6590a616c4d5c2f0020cc7ab;p=php

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

ba35ae32b7e9858e6590a616c4d5c2f0020cc7ab