From: Stanislav Malyshev <stas@php.net>
Date: Mon, 23 Mar 2015 05:04:41 +0000 (-0700)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a1bca171d23d504fcc57979472574117222aad95;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Print checking message for all ODBC drivers
  Change default option of ODBC drivers to no to enable bulding standalone ODBC

Conflicts:
	ext/odbc/config.m4
---

a1bca171d23d504fcc57979472574117222aad95