From: Christopher Jones <christopher.jones@oracle.com>
Date: Tue, 20 Jun 2017 04:33:35 +0000 (+1000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.7RC1~8
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b742a18ba4c64df2435721d0f800db48aba69f35;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  oci8 - Implementation of Oracle TAF Callback
---

b742a18ba4c64df2435721d0f800db48aba69f35