]> granicus.if.org Git - php/commitdiff
Merge remote-tracking branch 'origin/PHP-5.6' into PHP-7.0
authorMatteo Beccati <mbeccati@php.net>
Sat, 7 Nov 2015 09:46:17 +0000 (10:46 +0100)
committerMatteo Beccati <mbeccati@php.net>
Sat, 7 Nov 2015 09:46:17 +0000 (10:46 +0100)
* origin/PHP-5.6:
  Always remember NEWS....
  Fix compile warnings about comparison of unsigned expression always being true
  Bump OCI8 version
  Fix bug 68298 (PHP OCI8 OCI int overflow) (Senthil)


Trivial merge