From: Nikita Popov <nikic@php.net>
Date: Sun, 1 Dec 2013 12:48:09 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~171^2~9
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1acee0557993eda1c5349aa4fb2816be92f2d1ee;p=php

Merge branch 'PHP-5.6'
---

1acee0557993eda1c5349aa4fb2816be92f2d1ee