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

Merge branch 'PHP-5.6' into PHP-7.0

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

50cfe0a15c4b2c9781b1164fe801c99c57e0211e