]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorMichael Wallner <mike@php.net>
Wed, 9 Oct 2013 06:16:23 +0000 (08:16 +0200)
committerMichael Wallner <mike@php.net>
Wed, 9 Oct 2013 06:16:23 +0000 (08:16 +0200)
* PHP-5.5:
  consolidate NEWS with 5.4


Trivial merge