diff options
| author | Michael Wallner <mike@php.net> | 2013-08-20 19:21:53 +0200 |
|---|---|---|
| committer | Michael Wallner <mike@php.net> | 2013-08-20 19:21:53 +0200 |
| commit | 7f3e7eb95812649fd421b405990a96091010b8e9 (patch) | |
| tree | 1b45286a23879d7622870f122506224b7a391a95 /ext/xmlreader/php_xmlreader.c | |
| parent | 4cd9796be78bfb1cc88b5ed71cbd61e56937b8e7 (diff) | |
| parent | 27c803aaed259f76a66db1278eea05f30a8ec956 (diff) | |
| download | php-git-7f3e7eb95812649fd421b405990a96091010b8e9.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix bug #64953 (Postgres prepared statement positional parameter casting)
Conflicts:
ext/pdo/pdo_sql_parser.c
Diffstat (limited to 'ext/xmlreader/php_xmlreader.c')
0 files changed, 0 insertions, 0 deletions