]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorRemi Collet <remi@php.net>
Wed, 20 May 2015 06:14:02 +0000 (08:14 +0200)
committerRemi Collet <remi@php.net>
Wed, 20 May 2015 06:14:02 +0000 (08:14 +0200)
commit8ad4a21c44fa2256c7c26beca9d94edd89162649
tree246296d6a016f449df0576036f5c00e87c4c788f
parent890a28d4b97b5785f155618fc34134acb77f7a64
parent6da4feac358f407c7958eeaa1b128ca88d6c40d9
Merge branch 'PHP-5.6'

* PHP-5.6:
  NEWS 5.6
  NEWS 5.5
  Fixed Bug #69667 segfault in php_pgsql_meta_data
  fix test output (32bits)

Conflicts:
ext/pgsql/pgsql.c
ext/pgsql/pgsql.c