From: Andrey Hristov <andrey@php.net>
Date: Mon, 13 Jan 2014 10:40:59 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHPNG_MERGE~388^2~65
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cf9966671cff5dd8ed1bade250aac3a48de23893;p=php

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

cf9966671cff5dd8ed1bade250aac3a48de23893