From: Remi Collet <remi@php.net>
Date: Wed, 25 Mar 2015 09:33:31 +0000 (+0100)
Subject: Merge branch 'PHP-5.5' into PHP-5.6
X-Git-Tag: php-5.6.8RC1~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3924548bcb6be47beeee348ed9b01ab2d64ae3a7;p=php

Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  revert a4157423934edf7b8fdbcee163cced9bfd5748a, fix build odbc as shared
---

3924548bcb6be47beeee348ed9b01ab2d64ae3a7