]> granicus.if.org Git - php/commit
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)
commit9e4651f6f181e0d90daab2a97fb57a76fe105a29
tree1324b98c892bab2a1bdb1bf3ccd20179c067949a
parent2129de4569bec4acd89e5824a471f59d887c5b57
parent18cc5386de399f4410d8e5bf0a7aa5a06b0309be
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix typo
sapi/fpm/fpm/fastcgi.c