From: Andrey Hristov <andrey@php.net>
Date: Fri, 24 Jan 2014 10:31:33 +0000 (+0200)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~388^2~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3aa6f8bfdd5c3c2ef2b9940210da84303fab0d9e;p=php

Merge branch 'PHP-5.6'
---

3aa6f8bfdd5c3c2ef2b9940210da84303fab0d9e