From: David Soria Parra <dsp@php.net>
Date: Sun, 24 Mar 2013 13:06:25 +0000 (+0100)
Subject: Merge branch 'PHP-5.5'
X-Git-Tag: php-5.6.0alpha1~448^2~96
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=04c659a042f8e46dc89797c018c5f54861e104d4;p=php

Merge branch 'PHP-5.5'

* PHP-5.5:
---

04c659a042f8e46dc89797c018c5f54861e104d4