From: Joe Watkins <krakjoe@php.net>
Date: Tue, 24 Dec 2013 09:03:55 +0000 (+0000)
Subject: Merge branch 'master' of https://git.php.net/repository/php-src
X-Git-Tag: PRE_PHPNG_MERGE~353^2~102
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e07dfa96b3445293198c3c90c2641d0249964919;p=php

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

* 'master' of https://git.php.net/repository/php-src:
  Fixed credits in phpdbg.* files
  Added breaking upon fatal-ish error
  fix NEWS file for master
  credits file for phpdbg
  Fixed credits in phpdbg.* files
  reformat
  credits file
---

e07dfa96b3445293198c3c90c2641d0249964919