]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Wed, 26 Feb 2014 14:41:46 +0000 (15:41 +0100)
committerFerenc Kovacs <tyrael@php.net>
Wed, 26 Feb 2014 14:41:46 +0000 (15:41 +0100)
commit45ec37fb8903d7985e8dbed724846761eb701950
tree509ffa8162e13f92b8d08f8eac0f75ca3d243ad1
parent25941c293f00554c43db6500110ca087c666179e
parent44053a9daed3799cad2ccee90e237882c103021f
Merge branch 'PHP-5.6'

* PHP-5.6:
  move the default encoding NEWS entry to alpha3, as it was pushed after beta2 was tagged
  rearrange the NEWS blocks a bit