]> granicus.if.org Git - php/commitdiff
Merge branch '5.3' into 5.4
authorGeorge Wang <gwang@php.net>
Fri, 12 Oct 2012 17:09:53 +0000 (13:09 -0400)
committerGeorge Wang <gwang@php.net>
Fri, 12 Oct 2012 17:09:53 +0000 (13:09 -0400)
* 5.3:
  sapi/litespeed/lsapi_main.c: Fix bug #63228


Trivial merge