From: Johannes Schlüter <johannes@php.net>
Date: Sat, 18 Jan 2014 12:53:15 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=84efb8fc718d63c8522b0c1602caa84c84de8db1;p=php

Merge branch 'PHP-5.6'
---

84efb8fc718d63c8522b0c1602caa84c84de8db1