]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorStanislav Malyshev <stas@php.net>
Mon, 23 Dec 2013 22:10:44 +0000 (14:10 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 23 Dec 2013 22:10:44 +0000 (14:10 -0800)
* PHP-5.6:
  restore NEWS to the state of 6c5e93fe17c264aa28f8eeb4ec78c9e4a7eedfba


Trivial merge