From: Johannes Schlüter <johannes@php.net>
Date: Fri, 10 Jan 2014 15:04:29 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~65^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82dfe1acc88ccd5919f5040b341e2520dc809a7f;p=php

Merge branch 'PHP-5.6'
---

82dfe1acc88ccd5919f5040b341e2520dc809a7f