From: Stanislav Malyshev <stas@php.net>
Date: Tue, 27 May 2014 05:18:08 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: PRE_PHPNG_MERGE~260^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=49662be30b005b1fcc8aa6a9d2535d0915d1970d;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix #50444: PDO-ODBC changes for 64-bit
---

49662be30b005b1fcc8aa6a9d2535d0915d1970d