]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cde53e7 6e684e6)
Merge branch 'PHP-5.4' into PHP-5.5
authorAdam Harvey <aharvey@php.net>
Tue, 8 Jan 2013 03:45:26 +0000 (11:45 +0800)
committerAdam Harvey <aharvey@php.net>
Tue, 8 Jan 2013 03:45:26 +0000 (11:45 +0800)
* PHP-5.4:
  Add NEWS for the previously cherry picked commit.
  sapi/litespeed/lsapi_main.c: Fix bug #63228

Conflicts:
sapi/litespeed/lsapi_main.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.