]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Mon, 9 Jun 2014 13:30:49 +0000 (15:30 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 9 Jun 2014 13:30:49 +0000 (15:30 +0200)
* PHP-5.6:
  enable phpdbg for the travis build, and also run the testsuite for it


Trivial merge