]> granicus.if.org Git - php/commitdiff
Merge branch 'master' of git.php.net:php-src
authorDmitry Stogov <dmitry@zend.com>
Wed, 20 Aug 2014 11:04:03 +0000 (15:04 +0400)
committerDmitry Stogov <dmitry@zend.com>
Wed, 20 Aug 2014 11:04:03 +0000 (15:04 +0400)
* 'master' of git.php.net:php-src:
  phpdbg doesn't build due to the phpng merge, distable its build & test runs
  phpdbg doesn't build due to the phpng merge, distable it


Trivial merge