From: Christopher Jones Date: Tue, 1 May 2012 21:34:54 +0000 (-0700) Subject: Merge branch 'PHP-5.3' into PHP-5.4 X-Git-Tag: php-5.4.4RC1~67 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cac09f333384463613d1a27e79f9c7fa949f87db;p=php Merge branch 'PHP-5.3' into PHP-5.4 * PHP-5.3: Fix masking in bug61115-1.phpt --- cac09f333384463613d1a27e79f9c7fa949f87db