From: Stanislav Malyshev Date: Sun, 20 Apr 2014 23:36:36 +0000 (-0700) Subject: Merge branch 'PHP-5.5' into PHP-5.6 X-Git-Tag: PRE_PHPNG_MERGE~356^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5272d6c896b955d85a527f5a83da3ec8b434bb5a;p=php Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fix a compiler warning in php_rand.h --- 5272d6c896b955d85a527f5a83da3ec8b434bb5a