]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorJoe Watkins <krakjoe@php.net>
Mon, 23 Dec 2013 22:37:36 +0000 (22:37 +0000)
committerJoe Watkins <krakjoe@php.net>
Mon, 23 Dec 2013 22:37:36 +0000 (22:37 +0000)
* PHP-5.6:
  credits file for phpdbg


Trivial merge