From: Nikita Popov <nikic@php.net>
Date: Fri, 2 May 2014 10:52:44 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~319
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=46bcaf1b280a2399e3b8f439cfdce2bdeeb127f2;p=php

Merge branch 'PHP-5.6'
---

46bcaf1b280a2399e3b8f439cfdce2bdeeb127f2