]> granicus.if.org Git - php/commitdiff
Merge branch 'fix_travis' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 25 Aug 2013 07:29:33 +0000 (00:29 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 25 Aug 2013 07:29:33 +0000 (00:29 -0700)
* fix_travis:
  fix mysql tests & mark nextRowset problematic tests
  fix mysql init
  add openssl
  add mysql settings


Trivial merge