]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 23:35:49 +0000 (16:35 -0700)
committerStanislav Malyshev <stas@php.net>
Sun, 20 Apr 2014 23:35:49 +0000 (16:35 -0700)
* PHP-5.4:
  Fix a compiler warning in php_rand.h


Trivial merge