]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAnatol Belski <ab@php.net>
Sat, 4 Apr 2015 19:50:18 +0000 (21:50 +0200)
committerAnatol Belski <ab@php.net>
Sat, 4 Apr 2015 19:50:18 +0000 (21:50 +0200)
* PHP-5.5:
  updated NEWS
  added test for bug #69354
  revert skipif, this should run everywhere
  further ODBC 3.0 compliance
  more compliance with the ODBC 3.0
  test fixes


Trivial merge