From: Tjerk Meesters <datibbaw@php.net>
Date: Fri, 7 Mar 2014 11:24:50 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~503^2~6
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=777831a24b1259563048721a4ec023a0d4e1531f;p=php

Merge branch 'PHP-5.6'
---

777831a24b1259563048721a4ec023a0d4e1531f