From: Nikita Popov <nikic@php.net>
Date: Wed, 26 Feb 2014 15:42:55 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~504^2~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bfd967c11f040e4cf8eaa11c103ea29c8aad7905;p=php

Merge branch 'PHP-5.6'
---

bfd967c11f040e4cf8eaa11c103ea29c8aad7905