From: Christopher Jones Date: Fri, 29 Aug 2014 15:48:43 +0000 (-0700) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHP7_REMOVALS~193^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6fe0bdda9cd5f3d041d48f74b253fb01e142942d;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Remove 550+ compile warnings on OS X --- 6fe0bdda9cd5f3d041d48f74b253fb01e142942d