From: Xinchen Hui <laruence@php.net>
Date: Fri, 15 Aug 2014 08:58:22 +0000 (+0800)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d1b48a8b02d2fcee393aab7921d16054d323729b;p=php

Merge branch 'master' of https://git.php.net/repository/php-src

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

d1b48a8b02d2fcee393aab7921d16054d323729b