From: Tjerk Meesters <datibbaw@php.net>
Date: Sat, 12 Jul 2014 03:15:03 +0000 (+0800)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~87
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7de82eaeef24f3020610438877e375c9d35ac99c;p=php

Merge branch 'PHP-5.6'
---

7de82eaeef24f3020610438877e375c9d35ac99c