From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 5 Jun 2014 16:54:50 +0000 (+0400)
Subject: Merge branch 'master' into phpng
X-Git-Tag: POST_PHPNG_MERGE~221
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=717839735f92489227144fc6ae9ef1b4f637816a;p=php

Merge branch 'master' into phpng

* master: (29 commits)
  drop exec perm on doc files
  fix test for 5.4/5.5
  restore correct behavior of DateTime
  fix test use invalid code
  add test for previous fix
  NEWS
  NEWS
  NEWS
  Fix regression introduce in fix for bug #67118
  update news
  update NEWS
  Fix tests
  Fix possible segfault depending on memory location...
  Fixed startup segfault in non-debug builds Fixes issue #87
  PHP 5.4/5.5 compability in phpdbg_watch.c
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  fix gcov data with some locales (again)
  Update NEWS
  Fixed startup segfault in non-debug builds Fixes issue #87
  ...
---

717839735f92489227144fc6ae9ef1b4f637816a