From: Anatol Belski <ab@php.net>
Date: Sun, 22 Mar 2015 23:07:43 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~44
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=63d7cd7d5b9a8e94a0b6688ca21a0e7d3da9f132;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  cosmetic fix to default odbcver
  Remove extraneous strlen() call
---

63d7cd7d5b9a8e94a0b6688ca21a0e7d3da9f132