From: Christopher Jones <sixd@php.net>
Date: Thu, 25 Jul 2013 15:53:33 +0000 (-0700)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: php-5.6.0alpha1~376
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b39f973c63e0b9819bea5e9b1d03472d65b7e94d;p=php

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

# By Johannes Schlüter (3) and others
# Via Johannes Schlüter (4) and others
* 'master' of https://git.php.net/repository/php-src:
  Upper section name
  Update NEWs
  Fixed bug #65328 (Segfault when getting SplStack object Value)
  Initial PHP OCI8 2.0.0-dev commit.
  Expand the ZEND_STRL macro to handle platforms where strncmp() is a macro.
  fix missing include
  Fix bug 65299
  Fix compiler warning on redefined constant
  Fix comment
  fixed bug #65311 testsuite failure due to incomplete fix to bug28985.phpt
  fix bug #65028 	Phar::buildFromDirectory creates corrupt archives for some specific contents
---

b39f973c63e0b9819bea5e9b1d03472d65b7e94d