From: Nikita Popov <nikic@php.net>
Date: Sat, 18 Jan 2014 13:44:57 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~43
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89eab884d9aec3a023ac56289974647c446a0f60;p=php

Merge branch 'PHP-5.6'
---

89eab884d9aec3a023ac56289974647c446a0f60