From: Kalle Sommer Nielsen <kalle@php.net>
Date: Fri, 26 Jun 2015 08:24:45 +0000 (+0200)
Subject: Merge branch 'master' of https://git.php.net/push/php-src
X-Git-Tag: php-7.1.0alpha3~25^2~175
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3b589d8ca513bd55025002f8e0e692bec91b0fbb;p=php

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

3b589d8ca513bd55025002f8e0e692bec91b0fbb