Add NEWS entry for log() improvements
- fix bug #47358, glob returns error, should be empty array()

Conflicts:
	ext/standard/dir.c
fixed glob() edge case on windows, ref bug #47358
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fixed glob() edge case on windows, ref bug #47358
  - fix bug #47358, glob returns error, should be empty array()
split the glob() test to test different basedir
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  split the glob() test to test different basedir
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  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()
fix test
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  fix test
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  fix test
Merge branch 'PHP-5.6'

* PHP-5.6:
  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()
Fix bug #67716 - Segfault in cdf.c
Fix bug #67716 - Segfault in cdf.c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix bug #67716 - Segfault in cdf.c
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix bug #67716 - Segfault in cdf.c
  Fix bug #67716 - Segfault in cdf.c
add NEWS for 5.6 too
Merge branch 'PHP-5.6'

* PHP-5.6:
  add NEWS for 5.6 too
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