From: Anatol Belski Date: Tue, 23 Feb 2016 13:22:06 +0000 (+0100) Subject: Merge branch 'PHP-5.6' into PHP-7.0 X-Git-Tag: php-7.0.5RC1~77 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd75429ad87cfd7a00d92a4599bff6eb77cdcec1;p=php Merge branch 'PHP-5.6' into PHP-7.0 * PHP-5.6: make ext/odbc test credentials configurable --- cd75429ad87cfd7a00d92a4599bff6eb77cdcec1