]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Wed, 23 Sep 2015 17:57:56 +0000 (19:57 +0200)
committerAnatol Belski <ab@php.net>
Wed, 23 Sep 2015 17:57:56 +0000 (19:57 +0200)
* PHP-7.0:
  add test
  expose openssl config path so it can be tested
  Fix for Bug #70384  mysqli_real_query(): Unknown type 245 sent by the server


Trivial merge