]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 11:54:53 +0000 (12:54 +0100)
committerFerenc Kovacs <tyrael@php.net>
Thu, 27 Feb 2014 11:54:53 +0000 (12:54 +0100)
* PHP-5.6:
  list the fpm change hat rfc in UPGRADING


Trivial merge