]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorRasmus Lerdorf <rasmus@lerdorf.com>
Mon, 21 Oct 2013 00:56:14 +0000 (17:56 -0700)
committerRasmus Lerdorf <rasmus@lerdorf.com>
Mon, 21 Oct 2013 00:56:14 +0000 (17:56 -0700)
* PHP-5.4:
  Fix typo

1  2 
sapi/fpm/fpm/fastcgi.c

Simple merge