From: Pierrick Charron <pierrick@php.net>
Date: Wed, 26 Dec 2012 15:17:37 +0000 (-0500)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.4.11RC1~12
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=663434cd764b6030a4d9e6b565e0fff9eaa6a66c;p=php

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

663434cd764b6030a4d9e6b565e0fff9eaa6a66c