From: Andrey Hristov <andrey@php.net>
Date: Thu, 20 Mar 2014 14:16:12 +0000 (+0200)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~456^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e52334fdbecc1eba1a800f70bcfdcdf02c70ebd1;p=php

Merge branch 'PHP-5.5' into PHP-5.6

Conflicts:
	ext/mysqli/mysqli_api.c
---

e52334fdbecc1eba1a800f70bcfdcdf02c70ebd1