From: Christopher Jones <sixd@php.net>
Date: Fri, 26 Jul 2013 18:34:21 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~374
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fc410f6ecec9b4b096cf44ea1f86354e258da67c;p=php

Merge branch 'master' of https://git.php.net/repository/php-src

* 'master' of https://git.php.net/repository/php-src:
  Fix --enable-maintainer-zts mode in OCI8 2.0
---

fc410f6ecec9b4b096cf44ea1f86354e258da67c