From: Andrey Hristov <andrey@php.net>
Date: Wed, 6 Aug 2014 13:58:30 +0000 (+0300)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: PRE_PHPNG_MERGE~22^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=771a2e06143dcdcebf80bba808775ce5a6b27b54;p=php

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

771a2e06143dcdcebf80bba808775ce5a6b27b54