From: Matteo Beccati <mbeccati@php.net>
Date: Fri, 31 May 2013 14:26:54 +0000 (+0200)
Subject: Merge branch 'PHP-5.3' into PHP-5.4
X-Git-Tag: php-5.5.0RC3~14^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3b5b42e77bacbada3c85d3e3fa2303b44a701d2;p=php

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

a3b5b42e77bacbada3c85d3e3fa2303b44a701d2