From: Ferenc Kovacs <tyrael@php.net>
Date: Tue, 21 Jan 2014 10:21:28 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bf13b204218559029b84efc59b22c166fbc3e4a;p=php

Merge branch 'PHP-5.6'
---

2bf13b204218559029b84efc59b22c166fbc3e4a