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

Merge branch 'PHP-5.6'
---

3a9bdafeff344543311e84436176625f4ce88b40