From: Kalle Sommer Nielsen <kalle@php.net>
Date: Thu, 25 Jun 2015 17:09:00 +0000 (+0200)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: php-7.1.0alpha3~25^2~176
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7517d385eae7dd00ff7cc518490e2c2d8526b6e6;p=php

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

7517d385eae7dd00ff7cc518490e2c2d8526b6e6