From: Kalle Sommer Nielsen <kalle@php.net>
Date: Sun, 3 Apr 2016 23:31:59 +0000 (+0200)
Subject: Merge branch 'master' of git.php.net:php-src
X-Git-Tag: php-7.1.0alpha1~388^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1fca16f7ad74ad221f1caf45294cb9886a1f487;p=php

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

f1fca16f7ad74ad221f1caf45294cb9886a1f487