]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Fri, 2 May 2014 21:34:48 +0000 (14:34 -0700)
committerAdam Harvey <aharvey@php.net>
Fri, 2 May 2014 21:34:48 +0000 (14:34 -0700)
* PHP-5.6:
  Fix mysqli build when building against libmysqlclient.


Trivial merge