From: Ferenc Kovacs <tyrael@php.net>
Date: Mon, 18 Apr 2016 06:16:16 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~305
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67f533982f788aba5865cb158ef55b9e445502e8;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  prepare for 5.6.21RC1
---

67f533982f788aba5865cb158ef55b9e445502e8