From: Xinchen Hui <laruence@gmail.com>
Date: Sun, 21 Aug 2016 09:19:24 +0000 (+0800)
Subject: Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6
X-Git-Tag: php-5.6.26RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=226e21b0fe41d0122d573459f2161cc87505c972;p=php

Merge branch 'PHP-5.6' of git.php.net:/php-src into PHP-5.6

* 'PHP-5.6' of git.php.net:/php-src:
  Improvements to fix #72714, suggested by nikic
  Fix #65732: grapheme_*() is not Unicode compliant on CR LF sequence
  Fix #72714: _xml_startElementHandler() segmentation fault
  update NEWS
  Fixed bug #72852 imap_mail null dereference
  Revert "Fix dba configuration for Windows"
  Fix dba configuration for Windows
  Fix broken test include
  fix NEWS
  Add myself as PDO_OCI maintainer
---

226e21b0fe41d0122d573459f2161cc87505c972