From: Pierrick Charron <pierrick@php.net>
Date: Sat, 24 Mar 2012 21:59:46 +0000 (-0400)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.1RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f05a39fce42029c126d6dc315ffdad43d27c8e9;p=php

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

7f05a39fce42029c126d6dc315ffdad43d27c8e9