]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of https://git.php.net/repository/php-src
authorJoe Watkins <krakjoe@php.net>
Tue, 24 Dec 2013 09:03:55 +0000 (09:03 +0000)
committerJoe Watkins <krakjoe@php.net>
Tue, 24 Dec 2013 09:03:55 +0000 (09:03 +0000)
* '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


Trivial merge