From: Nikita Popov <nikic@php.net>
Date: Wed, 2 Jul 2014 20:35:19 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~131
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2d4d36d2a0423c8da3b0cebf88cbcdcceb8380d2;p=php

Merge branch 'PHP-5.6'
---

2d4d36d2a0423c8da3b0cebf88cbcdcceb8380d2