From: Felipe Pena Date: Tue, 22 Apr 2014 13:49:18 +0000 (-0300) Subject: Merge branch 'PHP-5.6' X-Git-Tag: PRE_PHPNG_MERGE~349 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fd96831f689575f157d332dfa9fdc26c0d2f827a;p=php Merge branch 'PHP-5.6' * PHP-5.6: sapi/litespeed/lsapi_main.c: Fix bug #63228 --- fd96831f689575f157d332dfa9fdc26c0d2f827a