From: Remi Collet <remi@php.net>
Date: Sun, 8 Mar 2015 06:36:35 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~103
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=43da0d302bf50a62296759869b4102e5aafcb6c3;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix odbc build as shared
---

43da0d302bf50a62296759869b4102e5aafcb6c3