From: Nikita Popov <nikic@php.net>
Date: Fri, 29 Nov 2013 22:31:13 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.0alpha1~156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66b0d17f042c74f829d2fc1ee38f3ad2e0ea9abf;p=php

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

66b0d17f042c74f829d2fc1ee38f3ad2e0ea9abf