com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pgsql/pgsql.c
| From: | Andrey Hristov | Date: | Wed, 26 Jun 2013 14:50:08 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/pgsql/pgsql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-72510@lists.php.net to get a copy of this message | ||
Commit: 781be5f1d74ea9406e9ab82f9f90844befcc67b3
Author: Andrey Hristov <andrey@php.net> Wed, 26 Jun 2013 16:50:08 +0200
Parents: 623386d79988d1aeea941bb463ece2c27f9ed5d0 b34e8d2e3e892d8844cf9af7c0ce4bf3ed698fc6
Branches: PHP-5.5 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=781be5f1d74ea9406e9ab82f9f90844befcc67b3
Log:
Merge branch 'PHP-5.4' into PHP-5.5
Conflicts:
NEWS
Changed paths:
MM ext/pgsql/pgsql.c
Diff: