]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorLior Kaplan <kaplanlior@gmail.com>
Fri, 14 Feb 2014 15:15:35 +0000 (17:15 +0200)
committerLior Kaplan <kaplanlior@gmail.com>
Fri, 14 Feb 2014 15:15:35 +0000 (17:15 +0200)
1  2 
ext/pgsql/php_pgsql.h

Simple merge