From: Adam Harvey Date: Fri, 2 May 2014 21:34:48 +0000 (-0700) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~317 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2f1148ae8a09cf7644255c31162819d04285bab2;p=php Merge branch 'PHP-5.6' * PHP-5.6: Fix mysqli build when building against libmysqlclient. --- 2f1148ae8a09cf7644255c31162819d04285bab2