From: Kalle Sommer Nielsen <kalle@php.net>
Date: Tue, 23 Jun 2015 11:39:12 +0000 (+0200)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: php-7.1.0alpha3~25^2~177
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6129a56c02f3a1072353663ec15f4f569a788ac3;p=php

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

6129a56c02f3a1072353663ec15f4f569a788ac3