From: Johannes Schlüter <johannes@php.net>
Date: Sat, 15 Feb 2014 19:06:15 +0000 (+0100)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~353^2~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc4e9d36a6a01d2f4f4026b2bd4bd7fbe57adef3;p=php

Merge branch 'PHP-5.6'
---

bc4e9d36a6a01d2f4f4026b2bd4bd7fbe57adef3