From: Nikita Popov <nikic@php.net>
Date: Wed, 12 Mar 2014 13:16:58 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0beta1~3^2~97
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e617dfbdf33057bf81435ec8f830ad2ba01c434d;p=php

Merge branch 'PHP-5.5' into PHP-5.6
---

e617dfbdf33057bf81435ec8f830ad2ba01c434d