Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 05:04:41 +0000 (22:04 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 23 Mar 2015 05:04:41 +0000 (22:04 -0700)
commita1bca171d23d504fcc57979472574117222aad95
treedfbced539add4917f15d058f197156cf1a7f9aa9
parent57f835e1484034d8198b1373c3263ad2dba1b7a8
parent6f5ed34d201c196919f00c8eb3992c9ff7fd3e85
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