From: Michael Wallner <mike@php.net>
Date: Tue, 20 Aug 2013 17:21:53 +0000 (+0200)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.6RC1~11^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f3e7eb95812649fd421b405990a96091010b8e9;p=php

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
---

7f3e7eb95812649fd421b405990a96091010b8e9