]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 26 Nov 2014 17:42:53 +0000 (18:42 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 26 Nov 2014 17:42:53 +0000 (18:42 +0100)
  merge phpdbg commits from PHP-5.6 but keep the phpdbg unchanged in master


Trivial merge