From: Andrey Hristov <andrey@php.net>
Date: Fri, 21 Mar 2014 12:33:32 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHPNG_MERGE~453
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b418bea1ac4122db8ce2715e32c5a6a6a53e36ad;p=php

Merge branch 'master' of git.php.net:php-src
---

b418bea1ac4122db8ce2715e32c5a6a6a53e36ad