]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorNikita Popov <nikic@php.net>
Thu, 21 Apr 2016 21:42:20 +0000 (23:42 +0200)
committerNikita Popov <nikic@php.net>
Thu, 21 Apr 2016 21:42:20 +0000 (23:42 +0200)
1  2 
ext/pgsql/pgsql.c

Simple merge