From: Andrey Hristov <andrey@php.net>
Date: Thu, 10 Apr 2014 15:22:01 +0000 (+0300)
Subject: Merge branch 'PHP-5.6'
X-Git-Tag: PRE_PHPNG_MERGE~412
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6828437c119c22f47fea5ea7b777aec247c5916c;p=php

Merge branch 'PHP-5.6'

Conflicts:
	NEWS
	ext/mysqlnd/mysqlnd_result.c
---

6828437c119c22f47fea5ea7b777aec247c5916c