From: Johannes Schlüter <johannes@php.net>
Date: Sun, 23 Feb 2014 14:00:06 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~504^2~38
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a61d7e62786ec500643d1ae6e6b882462238b8a0;p=php

Merge branch 'PHP-5.6'
---

a61d7e62786ec500643d1ae6e6b882462238b8a0