From: Ferenc Kovacs <tyrael@php.net>
Date: Thu, 9 Jun 2016 08:53:12 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha3~42^2~40
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4138db014c5c7159bba10e94e36f2c317bf93265;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  5.6.24 will be next
---

4138db014c5c7159bba10e94e36f2c317bf93265