From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Dec 2013 12:45:22 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~152
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3546e64bd872d2fcbd9634c59b103cecfa023a0;p=php

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

b3546e64bd872d2fcbd9634c59b103cecfa023a0