From: Joe Watkins <krakjoe@php.net>
Date: Wed, 20 Jan 2016 10:55:09 +0000 (+0000)
Subject: Merge branch 'master' of https://github.com/php/php-src
X-Git-Tag: php-7.1.0alpha1~617^2~56
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7d100866ec2aa941555b4616dedae69d935c601b;p=php

Merge branch 'master' of https://github.com/php/php-src
---

7d100866ec2aa941555b4616dedae69d935c601b