From: Kalle Sommer Nielsen <kalle@php.net>
Date: Tue, 7 Jul 2015 10:43:58 +0000 (+0200)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: php-7.0.0beta1~12^2~24^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2bd4b18c24a05779086f5ee81ae8252577787df5;p=php

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

2bd4b18c24a05779086f5ee81ae8252577787df5