From: Nikita Popov <nikic@php.net>
Date: Sat, 13 Feb 2016 14:21:16 +0000 (+0100)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.4RC1~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=70c8db08c6a4882898bc347a8ab1f9205f4e8467;p=php

Merge branch 'PHP-5.6' into PHP-7.0

Conflicts:
	ext/pdo_mysql/mysql_driver.c
---

70c8db08c6a4882898bc347a8ab1f9205f4e8467