From: Andrey Hristov <andrey@php.net>
Date: Mon, 10 Mar 2014 15:34:18 +0000 (+0200)
Subject: Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~496^2~3^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16043b261fade04498408e5835321720f1328779;p=php

Merge branch 'PHP-5.6' of git.php.net:php-src into PHP-5.6
---

16043b261fade04498408e5835321720f1328779