From: Nikita Popov <nikic@php.net>
Date: Sat, 4 Jan 2014 00:29:15 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~49
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72a16851f4cbbfb032b62be03e2255f805176c45;p=php

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

72a16851f4cbbfb032b62be03e2255f805176c45