]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 24 Sep 2014 07:41:02 +0000 (09:41 +0200)
committerFerenc Kovacs <tyrael@php.net>
Wed, 24 Sep 2014 07:41:02 +0000 (09:41 +0200)
* PHP-5.6:
  the order of the blocks should be Core, then exts in alphabetical order
  add missing NEWS entry for the phpdbg compilation fix


Trivial merge