From: Dmitry Stogov <dmitry@zend.com>
Date: Fri, 15 Aug 2014 04:10:08 +0000 (+0400)
Subject: Merge branch 'master' into phpng
X-Git-Tag: POST_PHPNG_MERGE^0
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8b66d64b2343bc4fd8aeabb690024edb850a0155;p=php

Merge branch 'master' into phpng

* master:
  add NEWS for 5.6 too
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
  fix test
  split the glob() test to test different basedir
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
  Add NEWS entry for log() improvements
---

8b66d64b2343bc4fd8aeabb690024edb850a0155