From: Christoph M. Becker Date: Fri, 3 Jul 2015 11:32:05 +0000 (+0200) Subject: Merge branch 'PHP-5.6' X-Git-Tag: php-7.1.0alpha3~25^2~21 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e75cf6b7e4fa291a99c97b6f6b77fca904d5569a;p=php Merge branch 'PHP-5.6' * PHP-5.6: fixed fix #69975 wrt. ODBCVER < 0x0300 --- e75cf6b7e4fa291a99c97b6f6b77fca904d5569a