]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 00:32:46 +0000 (02:32 +0200)
committerFerenc Kovacs <tyrael@php.net>
Mon, 30 Jun 2014 00:32:46 +0000 (02:32 +0200)
* PHP-5.6:
  fix the last fpm NEWS entry, the other bug is related, but not the same what we fixed here


Trivial merge